From f0fd659849c0e3dfbc8fcf808766760a9d8862dd Mon Sep 17 00:00:00 2001
From: em <eugen.mayer@kontextwork.de>
Date: Fri, 7 Jun 2024 16:58:50 +0200
Subject: [PATCH] Fix jakarta and distribution/bom

---
 dist/bom/pom.xml                                  | 12 ++++++++++++
 dist/full/pom.xml                                 |  8 ++++++++
 integration/spring-data/base-3.3/pom.xml          |  2 +-
 integration/spring-hateoas/webmvc-jakarta/pom.xml | 14 +++++++-------
 integration/spring-hateoas/webmvc/pom.xml         |  2 +-
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/dist/bom/pom.xml b/dist/bom/pom.xml
index 386a0428fc..c1e0ea27e2 100644
--- a/dist/bom/pom.xml
+++ b/dist/bom/pom.xml
@@ -306,6 +306,12 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <groupId>com.blazebit</groupId>
+                <artifactId>blaze-persistence-integration-spring-data-base-3.3</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-spring-data-1.x</artifactId>
@@ -366,6 +372,12 @@
                 <version>${project.version}</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <groupId>com.blazebit</groupId>
+                <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
+                <version>${project.version}</version>
+                <scope>compile</scope>
+            </dependency>
             <dependency>
                 <groupId>com.blazebit</groupId>
                 <artifactId>blaze-persistence-integration-spring-data-webmvc</artifactId>
diff --git a/dist/full/pom.xml b/dist/full/pom.xml
index 923345bf5f..43f8a36d81 100644
--- a/dist/full/pom.xml
+++ b/dist/full/pom.xml
@@ -167,6 +167,10 @@
             <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>
@@ -207,6 +211,10 @@
             <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>
diff --git a/integration/spring-data/base-3.3/pom.xml b/integration/spring-data/base-3.3/pom.xml
index 9fa85adc60..45b948b349 100644
--- a/integration/spring-data/base-3.3/pom.xml
+++ b/integration/spring-data/base-3.3/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${version.spring-data-3.1}</version>
+            <version>${version.spring-data-3.3}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/integration/spring-hateoas/webmvc-jakarta/pom.xml b/integration/spring-hateoas/webmvc-jakarta/pom.xml
index 6fcb6dbee3..ec6acfe70e 100644
--- a/integration/spring-hateoas/webmvc-jakarta/pom.xml
+++ b/integration/spring-hateoas/webmvc-jakarta/pom.xml
@@ -14,10 +14,10 @@
     <properties>
         <module.name>com.blazebit.persistence.integration.spring.hateoas.webmvc</module.name>
         <test.argLine />
-        <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.0.2</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.2.2</version.spring.hateoas>
         <main.java.version>17</main.java.version>
     </properties>
 
@@ -77,14 +77,14 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${version.jakarta-jpa-3.1-api}</version>
+            <version>${version.jakarta-jpa-3.3-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.1</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-base-3.3</artifactId>
             <scope>compile</scope>
         </dependency>
 
@@ -176,7 +176,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-3.3</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration/spring-hateoas/webmvc/pom.xml b/integration/spring-hateoas/webmvc/pom.xml
index e2d278a794..0673228cb4 100644
--- a/integration/spring-hateoas/webmvc/pom.xml
+++ b/integration/spring-hateoas/webmvc/pom.xml
@@ -443,7 +443,7 @@
               <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.0.2</version.spring.hateoas>
+              <version.spring.hateoas>2.2.2</version.spring.hateoas>
           </properties>
           <dependencies>
               <dependency>