Skip to content
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

Upgrade Spring Boot to 3.2.2 #5232

Merged
merged 1 commit into from
Jan 23, 2024
+4 −6
Merged

Upgrade Spring Boot to 3.2.2 #5232

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
2 changes: 1 addition & 1 deletion application/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import de.undercouch.gradle.tasks.download.Download
import org.gradle.crypto.checksum.Checksum

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 "com.gorylenko.gradle-git-properties" version "2.3.2"
id "checkstyle"
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/content/comment/ReplyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static Comparator<Reply> creationTimeAscComparator() {
reply -> reply.getMetadata().getCreationTimestamp();
// ascending order by creation time
// asc nulls high will be placed at the end
return Comparator.comparing(creationTime, Comparators.nullsLow())
return Comparator.comparing(creationTime, Comparators.nullsHigh())
JohnNiang marked this conversation as resolved.
Show resolved Hide resolved
.thenComparing(metadataCreationTime)
.thenComparing(reply -> reply.getMetadata().getName());
}
Expand Down
1 change: 0 additions & 1 deletion ...ion/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public Map<String, Object> getErrorAttributes(ServerRequest request,
@Override
public Throwable getError(ServerRequest request) {
return (Throwable) request.attribute(ERROR_INTERNAL_ATTRIBUTE).stream()
.peek(error -> request.attributes().putIfAbsent(ERROR_ATTRIBUTE, error))
.findFirst()
.orElseThrow(() -> new IllegalStateException(
"Missing exception attribute in ServerWebExchange"));
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public int compare(Comment c1, Comment c2) {

var creationTimeComparator = Comparator.<Comment, Instant>comparing(
comment -> comment.getSpec().getCreationTime(),
Comparators.nullsLow(Comparator.<Instant>reverseOrder()));
Comparators.nullsHigh(Comparator.<Instant>reverseOrder()));

var nameComparator = Comparator.<Comment, String>comparing(
comment -> comment.getMetadata().getName());
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
version=2.12.0-SNAPSHOT
snakeyaml.version=2.2
JohnNiang marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion platform/application/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.springframework.boot.gradle.plugin.SpringBootPlugin

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 'halo.publish'
id 'signing'
Expand Down
Loading