Fix for generics/assert used with Spring 3.2.5

p3t · May 13, 2024 · 6817a5b · 6817a5b
1 parent 00cae98
commit 6817a5b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/publish-githubpkg.yml b/.github/workflows/publish-githubpkg.yml
@@ -34,7 +34,6 @@ jobs:
           echo "BUILD_VERSION=${RELEASE_TAG#v}" >> "$GITHUB_ENV"
           echo "BUILD_VERSION=${RELEASE_TAG#v}" >> "$GITHUB_OUTPUT"
           echo "::notice title='Publishing release'::Release Version is ${RELEASE_TAG#v}"
-          cat $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v4

diff --git a/buildSrc/src/main/kotlin/io.vigier.java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/io.vigier.java-library-conventions.gradle.kts
@@ -17,7 +17,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom("org.springframework.boot:spring-boot-dependencies:3.2.4")
+        mavenBom("org.springframework.boot:spring-boot-dependencies:3.2.5")
     }
 
 }
@@ -46,7 +46,7 @@ dependencies {
 
 
     // Load BOM for Spring Boot.
-    implementation(platform("org.springframework.boot:spring-boot-dependencies:3.2.3"))
+    implementation(platform("org.springframework.boot:spring-boot-dependencies:3.2.5"))
     implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
     compileOnly("org.projectlombok:lombok:${lombokVersion}")
     testCompileOnly("org.projectlombok:lombok:${lombokVersion}")

diff --git a/...a/src/main/java/io/vigier/cursorpaging/jpa/bootstrap/CursorPageRepositoryFactoryBean.java b/...a/src/main/java/io/vigier/cursorpaging/jpa/bootstrap/CursorPageRepositoryFactoryBean.java
@@ -1,19 +1,18 @@
 package io.vigier.cursorpaging.jpa.bootstrap;
 
 import jakarta.persistence.EntityManager;
-import java.io.Serializable;
 import lombok.NonNull;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
+import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 
 /**
  * Factory bean for the CursorPageRepositoryFactory.
  *
  * @param <T> the type of the repository (factory)
  */
-public class CursorPageRepositoryFactoryBean<T extends JpaRepository<Object, Serializable>>
-        extends JpaRepositoryFactoryBean<T, Object, Serializable> {
+public class CursorPageRepositoryFactoryBean<T extends Repository<S, ID>, S, ID> extends
+        JpaRepositoryFactoryBean<T, S, ID> {
 
     public CursorPageRepositoryFactoryBean( final Class<? extends T> repositoryInterface ) {
         super( repositoryInterface );