springboot 3.1.2 (#3)

* wiremock 3 to fix NoClassDefFoundError: javax/servlet/DispatcherType Signed-off-by: HARPER Jon <jon.harper87@gmail.com>
gridsuite · Sep 22, 2023 · ba25392 · ba25392
1 parent 18e562f
commit ba25392
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-parent-ws</artifactId>
-        <version>12</version>
+        <version>15</version>
         <relativePath/>
     </parent>
 
@@ -44,7 +44,7 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>25</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>26</gridsuite-dependencies.version>
     </properties>
 
     <build>
@@ -71,8 +71,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
@@ -110,7 +110,7 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         </dependency>
 
         <!-- Runtime dependencies -->
@@ -151,8 +151,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/org/gridsuite/caseimport/server/CaseImportController.java b/src/main/java/org/gridsuite/caseimport/server/CaseImportController.java
@@ -35,8 +35,8 @@ public class CaseImportController {
     @PostMapping(value = "/cases", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = APPLICATION_JSON_VALUE)
     @Operation(summary = "Import a case in the parametrized directory")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The case is imported"),
-            @ApiResponse(responseCode = "400", description = "Invalid case file"),
-            @ApiResponse(responseCode = "422", description = "File with wrong extension")})
+        @ApiResponse(responseCode = "400", description = "Invalid case file"),
+        @ApiResponse(responseCode = "422", description = "File with wrong extension")})
     public ResponseEntity<Void> importCase(@Parameter(description = "case file") @RequestPart("caseFile") MultipartFile caseFile,
                                            @RequestHeader("userId") String userId) {
         caseImportService.importCaseInDirectory(caseFile, userId);

diff --git a/src/main/java/org/gridsuite/caseimport/server/CaseService.java b/src/main/java/org/gridsuite/caseimport/server/CaseService.java
@@ -73,7 +73,7 @@ UUID importCase(MultipartFile multipartFile) {
         return caseUuid;
     }
 
-    private static CaseImportException wrapRemoteError(String response, HttpStatus statusCode) {
+    private static CaseImportException wrapRemoteError(String response, HttpStatusCode statusCode) {
         if (!"".equals(response)) {
             throw new CaseImportException(CaseImportException.Type.REMOTE_ERROR, response);
         } else {