github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade Spring Boot to 3.2.2 (#5232) 

#### What type of PR is this?

/kind improvement
/area core

#### What this PR does / why we need it:

See https://github.com/spring-projects/spring-boot/releases/tag/v3.2.2 for more.

#### Does this PR introduce a user-facing change?

```release-note
升级依赖 Spring Boot 至 3.2.2
```
pull/5206/head^2
John Niang 2024-01-23 13:11:41 +08:00 committed by GitHub
parent 95878b3bb8
commit 9d9b1527bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/build.gradle
View File

@ -2,7 +2,7 @@ import de.undercouch.gradle.tasks.download.Download
import org.gradle.crypto.checksum.Checksum import org.gradle.crypto.checksum.Checksum
plugins { plugins {
id 'org.springframework.boot' version '3.2.0' id 'org.springframework.boot' version '3.2.2'
id 'io.spring.dependency-management' version '1.1.0' id 'io.spring.dependency-management' version '1.1.0'
id "com.gorylenko.gradle-git-properties" version "2.3.2" id "com.gorylenko.gradle-git-properties" version "2.3.2"
id "checkstyle" id "checkstyle"

2
application/src/main/java/run/halo/app/content/comment/ReplyService.java
View File

@ -31,7 +31,7 @@ public interface ReplyService {
reply -> reply.getMetadata().getCreationTimestamp(); reply -> reply.getMetadata().getCreationTimestamp();
// ascending order by creation time // ascending order by creation time
// asc nulls high will be placed at the end // asc nulls high will be placed at the end
return Comparator.comparing(creationTime, Comparators.nullsLow()) return Comparator.comparing(creationTime, Comparators.nullsHigh())
.thenComparing(metadataCreationTime) .thenComparing(metadataCreationTime)
.thenComparing(reply -> reply.getMetadata().getName()); .thenComparing(reply -> reply.getMetadata().getName());
} }

1
application/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java
View File

@ -40,7 +40,6 @@ public class ProblemDetailErrorAttributes implements ErrorAttributes {
@Override @Override
public Throwable getError(ServerRequest request) { public Throwable getError(ServerRequest request) {
return (Throwable) request.attribute(ERROR_INTERNAL_ATTRIBUTE).stream() return (Throwable) request.attribute(ERROR_INTERNAL_ATTRIBUTE).stream()
.peek(error -> request.attributes().putIfAbsent(ERROR_ATTRIBUTE, error))
.findFirst() .findFirst()
.orElseThrow(() -> new IllegalStateException( .orElseThrow(() -> new IllegalStateException(
"Missing exception attribute in ServerWebExchange")); "Missing exception attribute in ServerWebExchange"));

2
application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java
View File

@ -272,7 +272,7 @@ public class CommentPublicQueryServiceImpl implements CommentPublicQueryService
var creationTimeComparator = Comparator.<Comment, Instant>comparing( var creationTimeComparator = Comparator.<Comment, Instant>comparing(
comment -> comment.getSpec().getCreationTime(), comment -> comment.getSpec().getCreationTime(),
Comparators.nullsLow(Comparator.<Instant>reverseOrder())); Comparators.nullsHigh(Comparator.<Instant>reverseOrder()));
var nameComparator = Comparator.<Comment, String>comparing( var nameComparator = Comparator.<Comment, String>comparing(
comment -> comment.getMetadata().getName()); comment -> comment.getMetadata().getName());

1
gradle.properties
View File

@ -1,2 +1 @@
version=2.12.0-SNAPSHOT version=2.12.0-SNAPSHOT
snakeyaml.version=2.2

2
platform/application/build.gradle
View File

@ -1,7 +1,7 @@
import org.springframework.boot.gradle.plugin.SpringBootPlugin import org.springframework.boot.gradle.plugin.SpringBootPlugin
plugins { plugins {
id 'org.springframework.boot' version '3.2.0' apply false id 'org.springframework.boot' version '3.2.2' apply false
id 'java-platform' id 'java-platform'
id 'halo.publish' id 'halo.publish'
id 'signing' id 'signing'