chore: bump deps

Informasjonsforvaltning · Mar 13, 2024 · ace34f6 · ace34f6
1 parent 0d05047
commit ace34f6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.2.3</version>
         <relativePath/>
     </parent>
 
@@ -24,9 +24,9 @@
         <maven.compiler.source>${java.release}</maven.compiler.source>
         <maven.compiler.target>${java.release}</maven.compiler.target>
 
-        <kotlin.version>1.9.10</kotlin.version>
+        <kotlin.version>1.9.23</kotlin.version>
         <jena.version>4.9.0</jena.version>
-        <jackson.version>2.15.2</jackson.version>
+        <jackson.version>2.17.0</jackson.version>
     </properties>
 
     <dependencies>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.11.0</version>
+            <version>4.12.0</version>
         </dependency>
 
         <!-- CSV -->
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </dependency>
 
         <!-- Test -->
@@ -136,8 +136,14 @@
         </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
-            <artifactId>wiremock</artifactId>
-            <version>3.0.2</version>
+            <artifactId>wiremock-standalone</artifactId>
+            <version>3.4.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -28,4 +28,4 @@ spring:
   config.activate.on-profile: integration-test
 application:
   api-key: my-api-key
-  allowedOrigins: http://localhost:5000
+  allowedOrigins: http://localhost:5050
diff --git a/src/test/kotlin/no/fdk/dataset/preview/service/PreviewContractTest.kt b/src/test/kotlin/no/fdk/dataset/preview/service/PreviewContractTest.kt
@@ -30,15 +30,15 @@ class PreviewContractTest : ApiTestContext() {
     @Test
     fun `Unauthorized when api token is not included`() {
         assertThrows<CsrfTestException> {
-            val previewRequest = PreviewRequest("http://localhost:5000/download", 5)
+            val previewRequest = PreviewRequest("http://localhost:5050/download", 5)
             val rsp = authorizedRequest("/preview", port, mapper.writeValueAsString(previewRequest),
                 null, HttpMethod.POST)
         }
     }
 
     @Test
     fun ok_csv() {
-        val previewRequest = PreviewRequest("http://localhost:5000/download/csv", 5)
+        val previewRequest = PreviewRequest("http://localhost:5050/download/csv", 5)
         val rsp = authorizedRequest(
             "/preview", port, mapper.writeValueAsString(previewRequest),
             "my-api-key", HttpMethod.POST
@@ -53,7 +53,7 @@ class PreviewContractTest : ApiTestContext() {
 
     @Test
     fun ok_csv_zip() {
-        val previewRequest = PreviewRequest("http://localhost:5000/download/csv-zip", 5)
+        val previewRequest = PreviewRequest("http://localhost:5050/download/csv-zip", 5)
         val rsp = authorizedRequest(
             "/preview", port, mapper.writeValueAsString(previewRequest),
             "my-api-key", HttpMethod.POST
@@ -68,7 +68,7 @@ class PreviewContractTest : ApiTestContext() {
 
     @Test
     fun ok_xlsx_zip() {
-        val previewRequest = PreviewRequest("http://localhost:5000/download/xlsx-zip", 10)
+        val previewRequest = PreviewRequest("http://localhost:5050/download/xlsx-zip", 10)
         val rsp = authorizedRequest(
             "/preview", port, mapper.writeValueAsString(previewRequest),
             "my-api-key", HttpMethod.POST
@@ -85,7 +85,7 @@ class PreviewContractTest : ApiTestContext() {
 
     @Test
     fun ok_json_zip() {
-        val previewRequest = PreviewRequest("http://localhost:5000/download/json-zip", 10)
+        val previewRequest = PreviewRequest("http://localhost:5050/download/json-zip", 10)
         val rsp = authorizedRequest(
             "/preview", port, mapper.writeValueAsString(previewRequest),
             "my-api-key", HttpMethod.POST
@@ -104,7 +104,7 @@ class PreviewContractTest : ApiTestContext() {
 
     @Test
     fun `Bad request`() {
-        val previewRequest = PreviewRequest("http://localhost:5000/download-link-does-not-exist", 5)
+        val previewRequest = PreviewRequest("http://localhost:5050/download-link-does-not-exist", 5)
         val rsp = authorizedRequest(
             "/preview", port, mapper.writeValueAsString(previewRequest),
             "my-api-key", HttpMethod.POST

diff --git a/src/test/kotlin/no/fdk/dataset/preview/service/utils/ContractMock.kt b/src/test/kotlin/no/fdk/dataset/preview/service/utils/ContractMock.kt
@@ -4,7 +4,7 @@ import com.github.tomakehurst.wiremock.WireMockServer
 import com.github.tomakehurst.wiremock.client.WireMock.*
 import org.springframework.beans.factory.ObjectFactory
 
-private val mockserver = WireMockServer(5000)
+private val mockserver = WireMockServer(5050)
 
 fun startMockServer() {
     if(!mockserver.isRunning) {