Merge pull request #51 from Onlineberatung/upgrade-to-spring-boot-2.7.X

Upgrade to spring boot 2.7.x
virtualidentityag · May 22, 2024 · 581f569 · 581f569
2 parents 7712f84 + 31f1bd4
commit 581f569
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup JVM
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.10
+          java-version: 11.0.15
           java-package: jdk
           architecture: x64
 

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
 		<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
 		<spring-boot-starter-web.version>2.7.18</spring-boot-starter-web.version>
 		<spring-security-core.version>5.7.12</spring-security-core.version>
-		<spring-beans.version>5.3.35</spring-beans.version>
+		<spring-beans.version>5.3.31</spring-beans.version>
 		<spring-webmvc.version>5.3.35</spring-webmvc.version>
 		<spring-core.version>5.3.35</spring-core.version>
 		<json-smart.version>2.4.7</json-smart.version>

diff --git a/src/main/java/com/vi/migrationtool/keycloak/KeycloakService.java b/src/main/java/com/vi/migrationtool/keycloak/KeycloakService.java
@@ -18,7 +18,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.keycloak.representations.idm.RoleRepresentation;
-import org.springframework.boot.configurationprocessor.json.JSONException;
 import org.springframework.boot.configurationprocessor.json.JSONObject;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -264,7 +263,7 @@ private String getCreateRoleBody(String roleName) {
       JSONObject body = new JSONObject();
       body.put("name", roleName);
       return body.toString();
-    } catch (JSONException e) {
+    } catch (Exception e) {
       return null;
     }
   }

diff --git a/src/main/java/com/vi/migrationtool/keycloak/KeycloakUserService.java b/src/main/java/com/vi/migrationtool/keycloak/KeycloakUserService.java
@@ -15,7 +15,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.keycloak.representations.idm.UserRepresentation;
-import org.springframework.boot.configurationprocessor.json.JSONException;
 import org.springframework.boot.configurationprocessor.json.JSONObject;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -207,7 +206,7 @@ private Object getResetUserCredentialsBody(String password) {
       body.put("value", password);
       body.put("temporary", false);
       return body.toString();
-    } catch (JSONException e) {
+    } catch (Exception e) {
       return null;
     }
   }