[Blazebit#1333] Add support for Spring Boot/Data 2.5

beikov · Nov 4, 2024 · 7adc0a6 · 7adc0a6
1 parent b7e58cf
commit 7adc0a6
Show file tree

Hide file tree

Showing 17 changed files with 418 additions and 25 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -65,10 +65,15 @@ jobs:
             jdk: 8
             spring-data: spring-data-2.3.x
             deltaspike: deltaspike-1.9
+          - rdbms: h2
+            provider: hibernate-5.2
+            jdk: 8
+            spring-data: spring-data-2.4.x
+            deltaspike: deltaspike-1.9
           - rdbms: postgresql
             provider: hibernate-apt
             jdk: 8
-            spring-data: spring-data-2.4.x
+            spring-data: spring-data-2.5.x
             deltaspike: deltaspike-1.9
 
 ################################################
@@ -416,12 +421,12 @@ jobs:
             provider: hibernate-5.2
             jdk: 16
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.4.x
+            spring-data: spring-data-2.5.x
           - rdbms: h2
             provider: hibernate-5.2
             jdk: 17
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.4.x
+            spring-data: spring-data-2.5.x
           - rdbms: h2
             provider: hibernate-5.2
             jdk: 11
@@ -432,20 +437,20 @@ jobs:
             jdk: 15
             build-jdk: 15
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.4.x
+            spring-data: spring-data-2.5.x
           - rdbms: h2
             provider: hibernate-5.2
             jdk: 16
             build-jdk: 16
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.4.x
+            spring-data: spring-data-2.5.x
 # Neither Spring nor Deltaspike support reading JDK 17 class files yet
 #          - rdbms: h2
 #            provider: hibernate-5.2
 #            jdk: 17
 #            build-jdk: 17
 #            deltaspike: deltaspike-1.9
-#            spring-data: spring-data-2.4.x
+#            spring-data: spring-data-2.5.x
     steps:
       - uses: actions/checkout@v2
       - name: Update /etc/hosts file

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Not yet released
 ### New features
 
 * Introduction of the `CriteriaBuilderConfigurationContributors` SPI which allows third party libraries to extend the default `CriteriaBuilderConfiguration`.
+* Add support for Spring Boot/Data 2.5
 
 ### Bug fixes
 

diff --git a/README.md b/README.md
@@ -181,10 +181,10 @@ OpenJPA integration              | N/A                                  | (Curre
 Entity View CDI integration      | CDI 1.0                              | 1.0, 1.1, 1.2, 2.0
 Entity View Spring integration   | Spring 4.3                           | 4.3, 5.0, 5.1, 5.2
 DeltaSpike Data integration      | DeltaSpike 1.7                       | 1.7, 1.8, 1.9
-Spring Data integration          | Spring Data 1.11                     | 1.11, 2.0, 2.1, 2.2, 2.3
-Spring Data WebMvc integration   | Spring Data 1.11, Spring WebMvc 4.3  | Spring Data 1.11 - 2.3, Spring WebMvc 4.3 - 5.2
-Spring Data WebFlux integration  | Spring Data 2.0, Spring WebFlux 5.0  | Spring Data 2.0 - 2.3, Spring WebFlux 5.0 - 5.2
-Spring HATEOAS WebMvc integration| Spring Data 2.2, Spring WebMvc 5.2   | Spring Data 2.3, Spring WebMvc 5.2, Spring HATEOAS 1.0+
+Spring Data integration          | Spring Data 1.11                     | 1.11, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5
+Spring Data WebMvc integration   | Spring Data 1.11, Spring WebMvc 4.3  | Spring Data 1.11 - 2.5, Spring WebMvc 4.3 - 5.2
+Spring Data WebFlux integration  | Spring Data 2.0, Spring WebFlux 5.0  | Spring Data 2.0 - 2.5, Spring WebFlux 5.0 - 5.2
+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              | 5.2                                  | 5.2+
 JAX-RS integration               | Any JAX-RS version                   | Any JAX-RS version

diff --git a/examples/showcase/runner/spring/pom.xml b/examples/showcase/runner/spring/pom.xml
@@ -389,6 +389,24 @@
                 </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.4</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 
 </project>
diff --git a/examples/spring-data-graphql/pom.xml b/examples/spring-data-graphql/pom.xml
@@ -352,18 +352,51 @@
                 </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>${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>hibernate-apt</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>${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.4}</version>
+                    <version>${version.spring-data-2.5}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>

diff --git a/examples/spring-data-webflux/pom.xml b/examples/spring-data-webflux/pom.xml
@@ -303,18 +303,46 @@
                 </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.4</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>hibernate-apt</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>${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.4}</version>
+                    <version>${version.spring-data-2.5}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>

diff --git a/examples/spring-data-webmvc/pom.xml b/examples/spring-data-webmvc/pom.xml
@@ -341,18 +341,46 @@
                 </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.4</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>hibernate-apt</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>${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.4}</version>
+                    <version>${version.spring-data-2.5}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>

diff --git a/examples/spring-hateoas/pom.xml b/examples/spring-hateoas/pom.xml
@@ -341,18 +341,46 @@
                 </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.4</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>hibernate-apt</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>${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.4}</version>
+                    <version>${version.spring-data-2.5}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.aspectj</groupId>

diff --git a/integration/entity-view-spring/pom.xml b/integration/entity-view-spring/pom.xml
@@ -228,5 +228,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>spring-data-2.5.x</id>
+            <properties>
+                <version.spring>${version.spring-data-2.5-spring}</version.spring>
+                <maven.compiler.target>1.8</maven.compiler.target>
+                <maven.compiler.source>1.8</maven.compiler.source>
+            </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>
     </profiles>
 </project>