diff --git a/hawkbit-repository/hawkbit-repository-jpa-init/pom.xml b/hawkbit-repository/hawkbit-repository-jpa-init/pom.xml
index 9fe79f2f7..360cfc970 100644
--- a/hawkbit-repository/hawkbit-repository-jpa-init/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-jpa-init/pom.xml
@@ -126,6 +126,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <doclint>syntax</doclint>
+                    <legacyMode>true</legacyMode>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepositoryACM.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepositoryACM.java
index b42a58d7c..042d96563 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepositoryACM.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepositoryACM.java
@@ -31,7 +31,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
@@ -171,6 +170,11 @@ public class BaseEntityRepositoryACM<T extends AbstractJpaTenantAwareBaseEntity>
         return repository.findAll(accessController.appendAccessRules(AccessController.Operation.READ, spec), pageable);
     }
 
+    @Override
+    public Page<T> findAll(final Specification<T> spec, final Specification<T> countSpec, final Pageable pageable) {
+        return repository.findAll(accessController.appendAccessRules(AccessController.Operation.READ, spec), countSpec, pageable);
+    }
+
     @Override
     @NonNull
     public List<T> findAll(final Specification<T> spec, @NonNull final Sort sort) {
@@ -194,7 +198,7 @@ public class BaseEntityRepositoryACM<T extends AbstractJpaTenantAwareBaseEntity>
     }
 
     @Override
-    public <S extends T, R> R findBy(final Specification<T> spec, final Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
+    public <S extends T, R> R findBy(final Specification<T> spec, final Function<? super SpecificationFluentQuery<S>, R> queryFunction) {
         Objects.requireNonNull(spec, SPEC_MUST_NOT_BE_NULL);
         return repository.findBy(
                 // spec shall be non-null and the result of appending rules shall be non-null
diff --git a/pom.xml b/pom.xml
index 6e8d0335c..b704cc55c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.6</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>org.eclipse.hawkbit</groupId>
@@ -43,12 +43,12 @@
 
         <snapshotDependencyAllowed>true</snapshotDependencyAllowed>
 
-        <spring.boot.version>3.4.6</spring.boot.version>
-        <spring.cloud.version>2024.0.1</spring.cloud.version>
+        <spring.boot.version>3.5.0</spring.boot.version>
+        <spring.cloud.version>2025.0.0</spring.cloud.version>
         <springdoc-openapi.version>2.8.9</springdoc-openapi.version>
         <spring.plugin.core.version>3.0.0</spring.plugin.core.version>
-        <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
-        <!-- Newer versions needed than defined in Boot -->
+        <!-- Spring boot version overrides (should be reviewed with every Spring boot upgrade) - START -->
+        <!-- Newer versions needed than defined in the Spring boot -->
         <!-- Spring boot version overrides - END -->
 
         <!-- Eclipselink - START -->