Skip to content

Commit

Permalink
Upgrade spring-boot to 3.4 (#523)
Browse files Browse the repository at this point in the history
  • Loading branch information
olevitt authored Nov 22, 2024
1 parent 23bb178 commit 60621f7
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 16 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ Configurable properties :
### Other configurations
| Key | Default | Description |
| --------------------- | ------- | ------------------------------------------------------------------ |
| `logging.structured.format.console` | `` | Format for structured logging. Valid values : `ecs`, `gelf`, `logstash`. Leave empty for no structured logging (default). See https://docs.spring.io/spring-boot/reference/features/logging.html#features.logging.structured |
| `springdoc.swagger-ui.path` | `/` | Open API (swagger) UI path |
| `springdoc.swagger-ui.oauth.clientId` | `` | clientid used by swagger to authenticate the user, in general the same which is used by onyxia-ui is ok. |

Expand Down
4 changes: 0 additions & 4 deletions helm-wrapper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
<name>helm-wrapper</name>
<description>Simple wrapper for Helm (https://helm.sh)</description>

<properties>
<java.version>21</java.version>
</properties>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
Expand Down
11 changes: 7 additions & 4 deletions onyxia-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,14 @@
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</dependency>
</dependencies>

<properties>
<java.version>21</java.version>
</properties>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<version>4.12.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
Expand Down
5 changes: 4 additions & 1 deletion onyxia-api/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,8 @@ event.webhook.includes=
event.webhook.excludes=
# Response stream configuration
spring.mvc.async.request-timeout=600000
# Enabled admin endpoints
# Use structured logging (see https://docs.spring.io/spring-boot/reference/features/logging.html#features.logging.structured)
# Supported formats : ecs, gelf, logstash
#logging.structured.format.console=gelf
# Enable admin endpoints
admin.enabled=false
4 changes: 0 additions & 4 deletions onyxia-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<artifactId>onyxia</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.4</version>
<version>3.4.0</version>
</parent>
<modules>
<module>onyxia-model</module>
Expand All @@ -21,8 +21,8 @@
</distributionManagement>
<properties>
<fabric8io.version>6.13.4</fabric8io.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.release>21</maven.compiler.release>
<java.version>21</java.version>
</properties>

<dependencyManagement>
Expand Down

0 comments on commit 60621f7

Please sign in to comment.