[#1493] Add modules for Spring Data 2.5, 2.6 and 2.7

Blazebit · Aug 4, 2022 · 9fa6af7 · 9fa6af7
1 parent 39785f5
commit 9fa6af7
Show file tree

Hide file tree

Showing 87 changed files with 10,508 additions and 92 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -70,10 +70,15 @@ jobs:
             jdk: 8
             spring-data: spring-data-2.4.x
             deltaspike: deltaspike-1.9
+          - rdbms: h2
+            provider: hibernate-5.2
+            jdk: 8
+            spring-data: spring-data-2.5.x
+            deltaspike: deltaspike-1.9
           - rdbms: postgresql
             provider: hibernate-apt
             jdk: 8
-            spring-data: spring-data-2.5.x
+            spring-data: spring-data-2.6.x
             deltaspike: deltaspike-1.9
 
 ################################################
@@ -479,37 +484,37 @@ jobs:
             provider: hibernate-5.6
             jdk: 17
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.6.x
+            spring-data: spring-data-2.7.x
           - rdbms: h2
             provider: hibernate-5.6
             jdk: 17
             build-jdk: 17
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.6.x
+            spring-data: spring-data-2.7.x
 # Latest GA JDK
           - rdbms: h2
             provider: hibernate-5.6
             jdk: 18
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.6.x
+            spring-data: spring-data-2.7.x
           - rdbms: h2
             provider: hibernate-5.6
             jdk: 18
             build-jdk: 18
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.6.x
+            spring-data: spring-data-2.7.x
 # Early access JDKs
           - rdbms: h2
             provider: hibernate-5.6
             jdk: 19-ea
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.6.x
+            spring-data: spring-data-2.7.x
           - rdbms: h2
             provider: hibernate-5.6
             jdk: 19-ea
             build-jdk: 19-ea
             deltaspike: deltaspike-1.9
-            spring-data: spring-data-2.6.x
+            spring-data: spring-data-2.7.x
     steps:
       - uses: actions/checkout@v2
       - name: Update /etc/hosts file

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Not yet released
 * Add integration for Hibernate 6 supporting versions starting with 6.1.1.Final
 * Support for Java 16, 17, 18 and 19 EA
 * Support CTE's for left-nested set queries
+* Add separate integration modules for Spring Data 2.5, 2.6 and 2.7
 
 ### Bug fixes
 

diff --git a/checkstyle-rules/src/main/resources/blaze-persistence/checkstyle-suppressions.xml b/checkstyle-rules/src/main/resources/blaze-persistence/checkstyle-suppressions.xml
@@ -31,6 +31,8 @@
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]base[\\/]query[\\/]ParameterBinder\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]base[\\/]query[\\/]JpaParameters\.java$"/>
     <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]base[\\/]query[\\/]ParameterMetadataProvider\.java$"/>
+    <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]impl[\\/]repository[\\/]FluentQuerySupport\.java$"/>
+    <suppress checks="." files="[\\/]com[\\/]blazebit[\\/]persistence[\\/]spring[\\/]data[\\/]impl[\\/]repository[\\/]FetchableFluentQueryByExample\.java$"/>
     <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$"/>

diff --git a/dist/bom/pom.xml b/dist/bom/pom.xml
@@ -330,6 +330,24 @@
                 <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-webmvc</artifactId>

diff --git a/dist/full/pom.xml b/dist/full/pom.xml
@@ -183,6 +183,18 @@
             <groupId>com.blazebit</groupId>
             <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.blazebit</groupId>
+            <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.blazebit</groupId>
+            <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.blazebit</groupId>
+            <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
             <artifactId>blaze-persistence-integration-spring-data-webmvc</artifactId>

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
@@ -142,13 +142,13 @@ 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.4</artifactId>
+    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
 ----
 
-For Spring-Data version 2.3, 2.2, 2.1, 2.0 or 1.x use the artifact with the respective suffix `2.3`, `2.2`, `2.1`, `2.0`, `1.x`.
+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`.
 
 NOTE: The Spring Data integration depends on the _jpa-criteria_ module
 

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
@@ -16,7 +16,7 @@ In short, the following Maven dependencies are required
 ----
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
     <version>${blaze-persistence.version}</version>
     <scope>compile</scope>
 </dependency>
@@ -28,7 +28,7 @@ In short, the following Maven dependencies are required
 </dependency>
 ----
 
-For Spring-Data version 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.4`, `2.3`, `2.2`, `2.1`, `2.0`, `1.x`.
+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`.
 
 The dependencies for other JPA providers or other versions can be found in the link:{core_doc}#maven-setup[core module setup section].
 

diff --git a/examples/showcase/base/pom.xml b/examples/showcase/base/pom.xml
@@ -32,9 +32,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0.Final</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/examples/showcase/runner/spring/pom.xml b/examples/showcase/runner/spring/pom.xml
@@ -404,7 +404,7 @@
                 </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
                 </dependency>
             </dependencies>
         </profile>
@@ -422,7 +422,25 @@
                 </dependency>
                 <dependency>
                     <groupId>com.blazebit</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>spring-data-2.7.x</id>
+            <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>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>com.blazebit</groupId>
+                    <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/examples/spring-data-dgs/pom.xml b/examples/spring-data-dgs/pom.xml
@@ -459,7 +459,7 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -497,7 +497,45 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-2.6</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>blaze-persistence-integration-hibernate-5.4</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.4}</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>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>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>

diff --git a/examples/spring-data-graphql/pom.xml b/examples/spring-data-graphql/pom.xml
@@ -426,7 +426,7 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -459,7 +459,40 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <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>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.7</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>

diff --git a/examples/spring-data-spqr/pom.xml b/examples/spring-data-spqr/pom.xml
@@ -409,7 +409,7 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <artifactId>blaze-persistence-integration-spring-data-2.5</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
@@ -442,7 +442,40 @@
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>
-                    <artifactId>blaze-persistence-integration-spring-data-2.4</artifactId>
+                    <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>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.7</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>