Skip to content

Commit

Permalink
Upgrade to Spring Boot 3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zapek committed Nov 23, 2024
1 parent b006fe4 commit 5f7dc6f
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
13 changes: 13 additions & 0 deletions SandBox.wsb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Configuration>
<VGpu>Default</VGpu>
<Networking>Default</Networking>
<MappedFolders>
<MappedFolder>
<HostFolder>C:\Users\zapek\workspace\Xeres\app\build\distributions</HostFolder>
<ReadOnly>true</ReadOnly>
</MappedFolder>
</MappedFolders>
<LogonCommand>
<Command>msiexec /i C:\Users\WDAGutilityAccount\Desktop\distributions\Xeres-0.7.2.msi</Command>
</LogonCommand>
</Configuration>
6 changes: 4 additions & 2 deletions app/src/main/java/io/xeres/app/service/file/FileService.java
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,10 @@ private List<File> getFullPath(File file)
tree.add(file);
while (file.getParent() != null)
{
tree.add(file.getParent());
file = file.getParent();
var parent = file.getParent();
tree.add(parent);
parent.getChildren().add(file);
file = parent;
}
Collections.reverse(tree);

Expand Down
5 changes: 1 addition & 4 deletions app/src/main/resources/application-dev.properties
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,13 @@ logging.level.io.xeres.app.xrs.service.turtle=DEBUG

### Other settings

## Flyway
spring.flyway.clean-on-validation-error=false

## Swagger UI
springdoc.swagger-ui.tags-sorter=alpha

## Actuator
info.java.vm.vendor=${java.vm.vendor}
info.java.version=${java.version}
management.endpoint.shutdown.enabled=true
management.endpoint.shutdown.access=unrestricted
management.endpoints.web.exposure.include=*
management.endpoints.web.base-path=/api/v1/actuator
management.info.java.enabled=true
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ buildscript {
}

plugins {
id 'org.springframework.boot' version '3.3.6' apply false
id 'org.flywaydb.flyway' version '10.10.0' apply false // Keep the version in sync with spring-boot from time to time
id 'org.springframework.boot' version '3.4.0' apply false
id 'org.flywaydb.flyway' version '10.20.0' apply false // Keep the version in sync with spring-boot from time to time
id 'org.panteleyev.jpackageplugin' version '1.6.0' apply false
id 'org.sonarqube' version '6.0.0.5145'
}
Expand Down

0 comments on commit 5f7dc6f

Please sign in to comment.