Skip to content

Commit 5718f21

Browse files
build(deps): bump spring-boot from 3.4.0-M2 to 3.4.0-M3
* build(deps): bump the spring-boot group with 5 updates Bumps the spring-boot group with 5 updates: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-starter-tomcat](https://github.com/spring-projects/spring-boot) | `3.4.0-M2` | `3.4.0-M3` | | [org.springframework.boot:spring-boot-autoconfigure](https://github.com/spring-projects/spring-boot) | `3.4.0-M2` | `3.4.0-M3` | | [org.springframework.boot:spring-boot-starter-logging](https://github.com/spring-projects/spring-boot) | `3.4.0-M2` | `3.4.0-M3` | | [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) | `3.4.0-M2` | `3.4.0-M3` | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.4.0-M2` | `3.4.0-M3` | Updates `org.springframework.boot:spring-boot-starter-tomcat` from 3.4.0-M2 to 3.4.0-M3 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.0-M2...v3.4.0-M3) Updates `org.springframework.boot:spring-boot-autoconfigure` from 3.4.0-M2 to 3.4.0-M3 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.0-M2...v3.4.0-M3) Updates `org.springframework.boot:spring-boot-starter-logging` from 3.4.0-M2 to 3.4.0-M3 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.0-M2...v3.4.0-M3) Updates `org.springframework.boot:spring-boot-starter-test` from 3.4.0-M2 to 3.4.0-M3 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.0-M2...v3.4.0-M3) Updates `org.springframework.boot` from 3.4.0-M2 to 3.4.0-M3 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.0-M2...v3.4.0-M3) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-tomcat dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring-boot - dependency-name: org.springframework.boot:spring-boot-autoconfigure dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring-boot - dependency-name: org.springframework.boot:spring-boot-starter-logging dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring-boot - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring-boot - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring-boot ... Signed-off-by: dependabot[bot] <[email protected]> * fix spring data web support autoconfiguration loading the application context fails under spring boot 3.4.0-M3 due to a `NoUniqueBeanDefinitionException` caused by there being 2 `SpringDataWebSettings` beans available during bean dependency resolution. This might be related to the changes made in spring-projects/spring-boot#39797 Anyway, adding the `@EnableSpringDataWebSupport` annotation fixes the problem. * ci: add java 23 to test matrix --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JKatzwinkel <[email protected]>
1 parent bf79454 commit 5718f21

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/gradle.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
java-version:
16-
- 17
17-
- 21
18-
- 22
15+
java-version: [17, 21, 22, 23]
1916

2017
permissions:
2118
checks: write

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![build](https://github.com/jkatzwinkel/tla-es/workflows/build/badge.svg)
22
![deploy](https://github.com/jkatzwinkel/tla-es/workflows/deploy/badge.svg)
33
![search](https://github.com/jkatzwinkel/tla-es/workflows/searchtest/badge.svg)
4-
![LINE](https://img.shields.io/badge/line--coverage-82.38%25-brightgreen.svg)
4+
![LINE](https://img.shields.io/badge/line--coverage-82.14%25-brightgreen.svg)
55
![METHOD](https://img.shields.io/badge/method--coverage-81.84%25-brightgreen.svg)
66

77
# tla-es

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id 'maven-publish'
77
id 'de.undercouch.download' version '5.6.0'
88
id 'com.adarshr.test-logger' version '4.0.0'
9-
id 'org.springframework.boot' version '3.4.0-M2'
9+
id 'org.springframework.boot' version '3.4.0-M3'
1010
id 'org.barfuin.gradle.jacocolog' version '3.1.0'
1111
id 'com.github.ben-manes.versions' version '0.51.0'
1212
id 'com.github.dawnwords.jacoco.badge' version '0.2.4'
@@ -46,13 +46,13 @@ dependencies {
4646
implementation 'org.apache.commons:commons-compress:1.27.1'
4747
implementation 'org.yaml:snakeyaml:2.3'
4848

49-
implementation 'org.springframework.boot:spring-boot-starter-tomcat:3.4.0-M2'
50-
implementation 'org.springframework.boot:spring-boot-autoconfigure:3.4.0-M2'
49+
implementation 'org.springframework.boot:spring-boot-starter-tomcat:3.4.0-M3'
50+
implementation 'org.springframework.boot:spring-boot-autoconfigure:3.4.0-M3'
5151
implementation 'org.springframework.data:spring-data-elasticsearch:5.3.3'
5252
implementation 'org.springframework:spring-webmvc:6.2.0-RC1'
53-
implementation 'org.springframework.boot:spring-boot-starter-logging:3.4.0-M2'
53+
implementation 'org.springframework.boot:spring-boot-starter-logging:3.4.0-M3'
5454

55-
testImplementation('org.springframework.boot:spring-boot-starter-test:3.4.0-M2') {
55+
testImplementation('org.springframework.boot:spring-boot-starter-test:3.4.0-M3') {
5656
exclude group: 'org.xmlunit', module: 'xmlunit-core'
5757
exclude group: 'jakarta.xml.bind'
5858
}

src/main/java/tla/backend/App.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@
1212
import org.springframework.context.annotation.Bean;
1313
import org.springframework.context.annotation.ComponentScan;
1414
import org.springframework.context.annotation.Configuration;
15+
import org.springframework.data.web.config.EnableSpringDataWebSupport;
1516

1617
import lombok.extern.slf4j.Slf4j;
1718
import tla.backend.es.repo.RepoPopulator;
1819

20+
1921
@Slf4j
2022
@Configuration
2123
@ComponentScan
24+
@EnableSpringDataWebSupport
2225
@EnableAutoConfiguration(exclude = { ElasticsearchDataAutoConfiguration.class })
2326
public class App implements ApplicationRunner {
2427

0 commit comments

Comments
 (0)