Merge branch 'master' into new-build-agent

user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncSchedulerITCase.java

@@ -10,7 +10,7 @@ import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.bson.Document;
 import org.junit.jupiter.api.BeforeEach;
@@ -28,9 +28,9 @@ import de.itvsh.kop.user.UserTestFactory;
 import de.itvsh.kop.user.common.MongoDbTestProfile;
 import de.itvsh.kop.user.common.lock.Lock;
 import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
+import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
-import io.quarkus.test.junit.mockito.InjectMock;
 import io.quarkus.test.junit.mockito.InjectSpy;
 
 @QuarkusTest

user-manager-server/src/test/java/de/itvsh/kop/user/sync/SyncServiceITCase.java

@@ -32,7 +32,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -46,9 +46,9 @@ import de.itvsh.kop.user.UserService;
 import de.itvsh.kop.user.UserTestFactory;
 import de.itvsh.kop.user.common.MongoDbTestProfile;
 import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
+import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
-import io.quarkus.test.junit.mockito.InjectMock;
 import io.quarkus.test.junit.mockito.InjectSpy;
 
 @QuarkusTest

user-manager-server/src/test/java/de/itvsh/kop/user/userprofile/UserProfileGrpcServiceITCase.java

@@ -16,8 +16,8 @@ import de.itvsh.kop.user.common.callcontext.CallContextInterceptorTestFactory;
 import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
 import io.grpc.StatusRuntimeException;
 import io.quarkus.grpc.GrpcClient;
+import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.mockito.InjectMock;
 
 @QuarkusTest
 class UserProfileGrpcServiceITCase {

user-manager-server/src/test/resources/application.yml

@@ -14,16 +14,14 @@ quarkus:
   log:
     level: INFO
   oidc:
-  auth-server-url: https://sso.dev.ozg-sh.de/realms/sh-kiel-dev
+    auth-server-url: https://sso.dev.by.ozg-cloud.de/realms/by-kiel-dev
 
 kop:
   keycloak:
-  sync:
-   cron: "0 15 13 * * ?"
     api:
       user: "-"
       password: "-"
-   realm: sh-kiel-dev
+      realm: by-kiel-dev
       organisations-einheit-id-key: organisationseinheitId
       ldap-id-key: LDAP_ID
       client: sh-kiel-dev-goofy
@@ -31,3 +29,7 @@ kop:
     url: http://localhost:9092
 keycloak:
   url: http://localhost:8088
+
+ozgcloud:
+  usersync:
+    period: disabled
\ No newline at end of file