[#1906] Add new Spring Data/Boot 3.3 integration

Blazebit · Aug 2, 2024 · fd242fd · fd242fd
1 parent 26060d5
commit fd242fd
Show file tree

Hide file tree

Showing 105 changed files with 11,451 additions and 198 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -273,16 +273,16 @@ jobs:
             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: 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
@@ -307,16 +307,16 @@ jobs:
             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: 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
@@ -341,16 +341,16 @@ jobs:
             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: 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
@@ -380,16 +380,16 @@ jobs:
             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: 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
@@ -419,16 +419,16 @@ jobs:
             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: 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
@@ -458,16 +458,16 @@ jobs:
             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: 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
@@ -497,16 +497,16 @@ jobs:
             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: 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
@@ -568,21 +568,29 @@ jobs:
           - rdbms: h2
             provider: hibernate-6.2
             jdk: 11
+            spring-data: spring-data-3.1.x
 
 ################################################
-# hibernate-6.3
+# hibernate-6.4
 ################################################
           - rdbms: h2
-            provider: hibernate-6.3
-            jdk: 11
-
+            provider: hibernate-6.4
+            jdk: 17
+            spring-data: spring-data-3.2.x
 ################################################
-# hibernate-6.4
+# hibernate-6.5
 ################################################
           - rdbms: h2
-            provider: hibernate-6.4
-            jdk: 11
-
+            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
 ################################################
@@ -687,4 +695,4 @@ jobs:
           path: './**/*-reports/'
 
       - name: Omit produced artifacts from build cache
-        run: ./ci/before-cache.sh
+        run: ./ci/before-cache.sh
diff --git a/.github/workflows/latest.yaml b/.github/workflows/latest.yaml
@@ -28,17 +28,24 @@ jobs:
             jdk: 17
 
 ################################################
-# hibernate-6.3
+# hibernate-6.4
 ################################################
           - rdbms: h2
-            component: hibernate-6.3
+            component: hibernate-6.4
             jdk: 17
 
 ################################################
-# hibernate-6.4
+# hibernate-6.5
 ################################################
           - rdbms: h2
-            component: hibernate-6.4
+            component: hibernate-6.5
+            jdk: 17
+
+################################################
+# hibernate-6.6
+################################################
+          - rdbms: h2
+            component: hibernate-6.6
             jdk: 17
     steps:
       - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,17 @@ Changes that happened in releases
 
 ### New features
 
-None yet
+* Add support for Spring Data/Boot 3.3
+* Add `date_iso`, `time_iso` and `timestamp_iso` internal functions
 
 ### Bug fixes
 
 * Fix bug in collection insert code triggered by Hibernate ORM 6.4.2
+* Fix concurrency issue leading to NPE when concurrently creating entity view updaters
+* Fix `CAST_STRING` for SQL Server
+* Ensure Spring Jackson integration copies `ObjectMapper` bean
+* Fix entity view processor generated code for `@MappingSingular` leading to compilation error
+* Fix `MULTISET` issues with temporal `BasicUserType` 
 
 ### Backwards-incompatible changes
 

diff --git a/README.md b/README.md
@@ -202,7 +202,7 @@ OpenJPA integration              | N/A                                 | (Curren
 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
+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+
@@ -468,6 +468,8 @@ By default, a Maven build `mvn clean install` will test against H2 and Hibernate
 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

diff --git a/ci/build-github-latest.sh b/ci/build-github-latest.sh
@@ -6,15 +6,23 @@ java -version
 
 if [ "$COMPONENT" == 'hibernate-6.2' ]; then
   export JPAPROVIDER="hibernate-6.2"
+  export SPRING_DATA="spring-data-3.1.x"
   export PROPERTIES="-s $DIR/latest-settings.xml -Dversion.hibernate-6.2=[6.2,6.3.Alpha)"
-elif [ "$COMPONENT" == 'hibernate-6.3' ]; then
-  export JPAPROVIDER="hibernate-6.3"
-  export PROPERTIES="-s $DIR/latest-settings.xml -Dversion.hibernate-6.3=[6.3,6.4.Alpha)"
 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)"
 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)"
 fi