Skip to content

Commit aa39838

Browse files
committed
Bump spring-boot to 3.5.0
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
1 parent 883504d commit aa39838

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

hawkbit-repository/hawkbit-repository-jpa-init/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,14 @@
126126
</execution>
127127
</executions>
128128
</plugin>
129+
<plugin>
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-javadoc-plugin</artifactId>
132+
<configuration>
133+
<doclint>syntax</doclint>
134+
<legacyMode>true</legacyMode>
135+
</configuration>
136+
</plugin>
129137
</plugins>
130138
</build>
131139
</project>

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/BaseEntityRepositoryACM.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.springframework.data.domain.Slice;
3232
import org.springframework.data.domain.Sort;
3333
import org.springframework.data.jpa.domain.Specification;
34-
import org.springframework.data.repository.query.FluentQuery;
3534
import org.springframework.lang.NonNull;
3635
import org.springframework.lang.Nullable;
3736

@@ -171,6 +170,11 @@ public Page<T> findAll(final Specification<T> spec, @NonNull final Pageable page
171170
return repository.findAll(accessController.appendAccessRules(AccessController.Operation.READ, spec), pageable);
172171
}
173172

173+
@Override
174+
public Page<T> findAll(final Specification<T> spec, final Specification<T> countSpec, final Pageable pageable) {
175+
return repository.findAll(accessController.appendAccessRules(AccessController.Operation.READ, spec), countSpec, pageable);
176+
}
177+
174178
@Override
175179
@NonNull
176180
public List<T> findAll(final Specification<T> spec, @NonNull final Sort sort) {
@@ -194,7 +198,7 @@ public long delete(final Specification<T> spec) {
194198
}
195199

196200
@Override
197-
public <S extends T, R> R findBy(final Specification<T> spec, final Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
201+
public <S extends T, R> R findBy(final Specification<T> spec, final Function<? super SpecificationFluentQuery<S>, R> queryFunction) {
198202
Objects.requireNonNull(spec, SPEC_MUST_NOT_BE_NULL);
199203
return repository.findBy(
200204
// spec shall be non-null and the result of appending rules shall be non-null

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>org.springframework.boot</groupId>
1919
<artifactId>spring-boot-starter-parent</artifactId>
20-
<version>3.4.6</version>
20+
<version>3.5.0</version>
2121
</parent>
2222

2323
<groupId>org.eclipse.hawkbit</groupId>
@@ -43,8 +43,8 @@
4343

4444
<snapshotDependencyAllowed>true</snapshotDependencyAllowed>
4545

46-
<spring.boot.version>3.4.6</spring.boot.version>
47-
<spring.cloud.version>2024.0.1</spring.cloud.version>
46+
<spring.boot.version>3.5.0</spring.boot.version>
47+
<spring.cloud.version>2025.0.0</spring.cloud.version>
4848
<springdoc-openapi.version>2.8.8</springdoc-openapi.version>
4949
<spring.plugin.core.version>3.0.0</spring.plugin.core.version>
5050
<!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->

0 commit comments

Comments
 (0)