Skip to content

Bump spring-boot to 3.5.0 #2418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Bump spring-boot to 3.5.0 #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .../src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepositoryACM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
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;

Expand Down Expand Up @@ -171,6 +170,11 @@ public Page<T> findAll(final Specification<T> spec, @NonNull final Pageable page
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) {
Expand All @@ -194,7 +198,7 @@ public long delete(final Specification<T> spec) {
}

@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
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -43,7 +43,7 @@

<snapshotDependencyAllowed>true</snapshotDependencyAllowed>

<spring.boot.version>3.4.6</spring.boot.version>
<spring.boot.version>3.5.0</spring.boot.version>
<spring.cloud.version>2024.0.1</spring.cloud.version>
<springdoc-openapi.version>2.8.8</springdoc-openapi.version>
<spring.plugin.core.version>3.0.0</spring.plugin.core.version>
Expand Down
Loading