Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump org.springframework:spring-framework-bom from 6.0.13 to 6.1.0 #1681

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Bump org.springframework:spring-framework-bom from 6.0.13 to 6.1.0 #1681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions logbook-openfeign/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
11 changes: 5 additions & 6 deletions logbook-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@
<slf4j.version>2.0.9</slf4j.version>
<feign.version>13.1</feign.version>

<spring.version>6.0.13</spring.version>
<spring-boot.version>3.1.5</spring-boot.version>
<spring-security.version>6.2.0</spring-security.version>
<spring.version>6.1.1</spring.version>
<spring-boot.version>3.2.0</spring-boot.version>

<junit.version>5.10.1</junit.version>
<mockito.version>5.1.1</mockito.version>
Expand Down Expand Up @@ -269,9 +268,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<version>3.0.0-beta-10</version>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>3.3.1</version>
<scope>test</scope>
</dependency>
<!-- Needed by json-path-assert and rest-client-driver... -->
Expand Down
38 changes: 13 additions & 25 deletions logbook-spring-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
</scm>
<dependencyManagement>
<dependencies>
<!-- Because spring-security would pull in the wrong version otherwise -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -80,11 +79,16 @@
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring-boot.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring-security.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -109,31 +113,15 @@
<groupId>org.zalando</groupId>
<artifactId>logbook-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
Expand Down
13 changes: 7 additions & 6 deletions logbook-spring-boot-webflux-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@
</scm>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
Expand Down Expand Up @@ -88,12 +95,6 @@
<artifactId>spring-boot-starter-webflux</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
10 changes: 2 additions & 8 deletions logbook-spring-webflux/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@
<artifactId>spring-boot-starter-webflux</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -75,8 +69,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
17 changes: 8 additions & 9 deletions logbook-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,14 @@
</dependency>

<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>

Expand All @@ -90,13 +96,6 @@
</exclusions>
</dependency>

<!-- Required by Wiremock due to https://github.com/wiremock/wiremock/pull/2134/ -->
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion ...k-spring/src/main/java/org/zalando/logbook/spring/BufferingClientHttpResponseWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public BufferingClientHttpResponseWrapper(ClientHttpResponse delegate) throws IO
}

@Override
@SuppressWarnings("deprecation")
@SuppressWarnings("removal")
public int getRawStatusCode() throws IOException {
return delegate.getRawStatusCode();
}
Expand Down
2 changes: 1 addition & 1 deletion logbook-spring/src/main/java/org/zalando/logbook/spring/RemoteResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private static final class Passing implements State {

}

@SuppressWarnings("deprecation")
@SuppressWarnings("removal")
@Override
public int getStatus() {
try {
Expand Down
2 changes: 1 addition & 1 deletion ...ring/src/test/java/org/zalando/logbook/spring/BufferingClientHttpResponseWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void getStatusCode() throws IOException {
}

@Test
@SuppressWarnings("deprecation")
@SuppressWarnings("removal")
void getRawStatusCode() throws IOException {
when(delegate.getRawStatusCode()).thenReturn(200);

Expand Down
4 changes: 2 additions & 2 deletions logbook-spring/src/test/java/org/zalando/logbook/spring/RemoteResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void statusCanThrow() throws IOException {
}

@Test
@SuppressWarnings("deprecation")
@SuppressWarnings("removal")
void statusSpring2() throws IOException {
ClientHttpResponse response = mock(ClientHttpResponse.class);
when(response.getStatusCode()).thenThrow(new NoSuchMethodError());
Expand All @@ -33,7 +33,7 @@ void statusSpring2() throws IOException {
}

@Test
@SuppressWarnings("deprecation")
@SuppressWarnings("removal")
void getRawStatusThrows() throws IOException {
ClientHttpResponse response = mock(ClientHttpResponse.class);
when(response.getStatusCode()).thenThrow(new NoSuchMethodError());
Expand Down