Skip to content

Commit

Permalink
build(deps): bump spring-boot from 3.4.0-M2 to 3.4.0-M3
Browse files Browse the repository at this point in the history
* 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] <support@github.com>

* 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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: JKatzwinkel <JKatzwinkel@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and JKatzwinkel authored Sep 22, 2024
1 parent bf79454 commit 5718f21
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ jobs:

strategy:
matrix:
java-version:
- 17
- 21
- 22
java-version: [17, 21, 22, 23]

permissions:
checks: write
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![build](https://github.com/jkatzwinkel/tla-es/workflows/build/badge.svg)
![deploy](https://github.com/jkatzwinkel/tla-es/workflows/deploy/badge.svg)
![search](https://github.com/jkatzwinkel/tla-es/workflows/searchtest/badge.svg)
![LINE](https://img.shields.io/badge/line--coverage-82.38%25-brightgreen.svg)
![LINE](https://img.shields.io/badge/line--coverage-82.14%25-brightgreen.svg)
![METHOD](https://img.shields.io/badge/method--coverage-81.84%25-brightgreen.svg)

# tla-es
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id 'maven-publish'
id 'de.undercouch.download' version '5.6.0'
id 'com.adarshr.test-logger' version '4.0.0'
id 'org.springframework.boot' version '3.4.0-M2'
id 'org.springframework.boot' version '3.4.0-M3'
id 'org.barfuin.gradle.jacocolog' version '3.1.0'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'com.github.dawnwords.jacoco.badge' version '0.2.4'
Expand Down Expand Up @@ -46,13 +46,13 @@ dependencies {
implementation 'org.apache.commons:commons-compress:1.27.1'
implementation 'org.yaml:snakeyaml:2.3'

implementation 'org.springframework.boot:spring-boot-starter-tomcat:3.4.0-M2'
implementation 'org.springframework.boot:spring-boot-autoconfigure:3.4.0-M2'
implementation 'org.springframework.boot:spring-boot-starter-tomcat:3.4.0-M3'
implementation 'org.springframework.boot:spring-boot-autoconfigure:3.4.0-M3'
implementation 'org.springframework.data:spring-data-elasticsearch:5.3.3'
implementation 'org.springframework:spring-webmvc:6.2.0-RC1'
implementation 'org.springframework.boot:spring-boot-starter-logging:3.4.0-M2'
implementation 'org.springframework.boot:spring-boot-starter-logging:3.4.0-M3'

testImplementation('org.springframework.boot:spring-boot-starter-test:3.4.0-M2') {
testImplementation('org.springframework.boot:spring-boot-starter-test:3.4.0-M3') {
exclude group: 'org.xmlunit', module: 'xmlunit-core'
exclude group: 'jakarta.xml.bind'
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/tla/backend/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.web.config.EnableSpringDataWebSupport;

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


@Slf4j
@Configuration
@ComponentScan
@EnableSpringDataWebSupport
@EnableAutoConfiguration(exclude = { ElasticsearchDataAutoConfiguration.class })
public class App implements ApplicationRunner {

Expand Down

0 comments on commit 5718f21

Please sign in to comment.