Skip to content

Commit

Permalink
upgrade to spring-boot 3.2.0-RC1 (#236)
Browse files Browse the repository at this point in the history
build(deps): bump the spring-boot group with 4 updates
  • Loading branch information
JKatzwinkel authored Oct 24, 2023
2 parents 8d2c89b + 45197ee commit 48ba1ea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ dependencies {
implementation 'org.modelmapper:modelmapper:3.2.0'
implementation 'org.jooq:jool:0.9.15'

implementation('org.springframework.boot:spring-boot-starter-jetty:3.2.0-M3') {
implementation('org.springframework.boot:spring-boot-starter-jetty:3.2.0-RC1') {
exclude module: 'jetty-xml'
}
implementation('org.springframework.boot:spring-boot-starter-web:3.2.0-M3') {
implementation('org.springframework.boot:spring-boot-starter-web:3.2.0-RC1') {
exclude module: 'spring-boot-starter-tomcat'
}
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.0-M3'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.0-RC1'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0'
implementation 'org.apache.commons:commons-lang3:3.13.0'

Expand All @@ -96,7 +96,7 @@ dependencies {
exclude group: 'bouncycastle'
}

testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.0-M3'
testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.0-RC1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
}
Expand Down
13 changes: 3 additions & 10 deletions src/main/java/tla/web/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,20 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketServletAutoConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.core.SpringProperties;

import lombok.extern.slf4j.Slf4j;

@Slf4j
// exclusion only necessary until spring boot 3.2.0-M4
// (cf. https://github.com/spring-projects/spring-boot/issues/37660) ⬇:
@SpringBootApplication(exclude = WebSocketServletAutoConfiguration.class)
@SpringBootApplication
public class App {

public static void main(String[] args) {
SpringProperties.setFlag("spring.xml.ignore");
ApplicationContext context = SpringApplication.run(
App.class,
args
);
ApplicationContext context = SpringApplication.run(App.class, args);
log.info(
"bean definitions: {}",
context.getBeanDefinitionNames().length
"bean definitions: {}", context.getBeanDefinitionNames().length
);
}

Expand Down

0 comments on commit 48ba1ea

Please sign in to comment.