Bump Logbook version to 3.0.0

zalando · May 25, 2023 · 4ce32a7 · 4ce32a7
1 parent acdaf3e
commit 4ce32a7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/riptide-logbook/src/test/java/org/zalando/riptide/logbook/LogbookPluginStreamingTest.java b/riptide-logbook/src/test/java/org/zalando/riptide/logbook/LogbookPluginStreamingTest.java
@@ -11,10 +11,10 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpResponse;
 import org.zalando.logbook.Correlation;
-import org.zalando.logbook.DefaultSink;
 import org.zalando.logbook.HttpLogWriter;
 import org.zalando.logbook.Logbook;
 import org.zalando.logbook.Precorrelation;
+import org.zalando.logbook.core.DefaultSink;
 import org.zalando.logbook.json.JsonHttpLogFormatter;
 import org.zalando.riptide.Http;
 import org.zalando.riptide.httpclient.ApacheClientHttpRequestFactory;
@@ -29,9 +29,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.springframework.http.HttpMethod.POST;
 import static org.springframework.http.HttpStatus.OK;
 import static org.zalando.riptide.PassRoute.pass;

diff --git a/riptide-logbook/src/test/java/org/zalando/riptide/logbook/LogbookPluginTest.java b/riptide-logbook/src/test/java/org/zalando/riptide/logbook/LogbookPluginTest.java
@@ -11,10 +11,10 @@
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.zalando.logbook.Correlation;
-import org.zalando.logbook.DefaultSink;
 import org.zalando.logbook.HttpLogWriter;
 import org.zalando.logbook.Logbook;
 import org.zalando.logbook.Precorrelation;
+import org.zalando.logbook.core.DefaultSink;
 import org.zalando.logbook.json.JsonHttpLogFormatter;
 import org.zalando.riptide.Http;
 import org.zalando.riptide.compression.RequestCompressionPlugin;
@@ -29,9 +29,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.springframework.http.HttpMethod.POST;
 import static org.springframework.http.HttpStatus.OK;
 import static org.zalando.riptide.PassRoute.pass;

diff --git a/riptide-parent/pom.xml b/riptide-parent/pom.xml
@@ -20,12 +20,12 @@
         <jackson.version>2.14.2</jackson.version>
         <jackson-databind.version>2.14.2</jackson-databind.version>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
-        <logbook.version>2.16.0</logbook.version>
+        <logbook.version>3.0.0</logbook.version>
         <micrometer.version>1.10.4</micrometer.version>
         <mockito.version>4.11.0</mockito.version>
         <problem.version>0.27.1</problem.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <spring-boot.version>2.7.9</spring-boot.version>
+        <spring-boot.version>2.7.12</spring-boot.version>
     </properties>
 
     <dependencyManagement>