Skip to content

Commit

Permalink
build(deps): bump spring-boot from 3.4.0-M3 to 3.4.0-RC1
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-M3` | `3.4.0-RC1` |
| [org.springframework.boot:spring-boot-autoconfigure](https://github.com/spring-projects/spring-boot) | `3.4.0-M3` | `3.4.0-RC1` |
| [org.springframework.boot:spring-boot-starter-logging](https://github.com/spring-projects/spring-boot) | `3.4.0-M3` | `3.4.0-RC1` |
| [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) | `3.4.0-M3` | `3.4.0-RC1` |
| [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.4.0-M3` | `3.4.0-RC1` |


Updates `org.springframework.boot:spring-boot-starter-tomcat` from 3.4.0-M3 to 3.4.0-RC1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.4.0-M3...v3.4.0-RC1)

Updates `org.springframework.boot:spring-boot-autoconfigure` from 3.4.0-M3 to 3.4.0-RC1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.4.0-M3...v3.4.0-RC1)

Updates `org.springframework.boot:spring-boot-starter-logging` from 3.4.0-M3 to 3.4.0-RC1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.4.0-M3...v3.4.0-RC1)

Updates `org.springframework.boot:spring-boot-starter-test` from 3.4.0-M3 to 3.4.0-RC1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.4.0-M3...v3.4.0-RC1)

Updates `org.springframework.boot` from 3.4.0-M3 to 3.4.0-RC1
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.4.0-M3...v3.4.0-RC1)

---
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]>

* ci: execute entire test matrix

* add workaround for spy bean override issue in spring 6.2.0-RC3

see spring-projects/spring-framework#33800

can be reverted when spring 6.2.0 GA comes out.

---------

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]>
  • Loading branch information
dependabot[bot] and JKatzwinkel authored Oct 31, 2024
1 parent e182aa5 commit bd28987
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
strategy:
matrix:
java-version: [17, 21, 22, 23]
fail-fast: false

permissions:
checks: write
Expand Down
14 changes: 9 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-M3'
id 'org.springframework.boot' version '3.4.0-RC1'
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 All @@ -33,6 +33,8 @@ repositories {
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://jitpack.io' }
// ⬇ dropwith spring 6.2.0-RC4
maven { url 'https://repo.spring.io/snapshot' }
}

dependencies {
Expand All @@ -46,18 +48,20 @@ 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-M3'
implementation 'org.springframework.boot:spring-boot-autoconfigure:3.4.0-M3'
implementation 'org.springframework.boot:spring-boot-starter-tomcat:3.4.0-RC1'
implementation 'org.springframework.boot:spring-boot-autoconfigure:3.4.0-RC1'
implementation 'org.springframework.data:spring-data-elasticsearch:5.4.0-RC1'
implementation 'org.springframework:spring-webmvc:6.2.0-RC3'
implementation 'org.springframework.boot:spring-boot-starter-logging:3.4.0-M3'
implementation 'org.springframework.boot:spring-boot-starter-logging:3.4.0-RC1'

testImplementation('org.springframework.boot:spring-boot-starter-test:3.4.0-M3') {
testImplementation('org.springframework.boot:spring-boot-starter-test:3.4.0-RC1') {
exclude group: 'org.xmlunit', module: 'xmlunit-core'
exclude group: 'jakarta.xml.bind'
}
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.3'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
// ⬇ dropwith spring 6.2.0-RC4
testImplementation 'org.springframework:spring-test:6.2.0-SNAPSHOT'
}

application {
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/tla/backend/service/SentenceServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ void getSentenceSearchResultsWrapper() throws Exception {
translation.setText("Blut der ersten Geburt der Kobra");
translation.setLang(new Language[]{Language.DE});
cmd.setTranslation(translation);
var query = sentenceService.getSearchCommandAdapter(cmd);
assertNotNull(query);
doReturn(hits).when(operations).search(
any(org.springframework.data.elasticsearch.core.query.Query.class),
eq(SentenceEntity.class),
Expand Down

0 comments on commit bd28987

Please sign in to comment.