diff --git a/pom.xml b/pom.xml index 8eb497436..278fa2360 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ spring-boot-starter-validation - org.springframework.security + com.github.fairdatateam spring-security-acl-mongodb ${spring.security.acl.mongo.version} diff --git a/src/main/java/nl/dtls/fairdatapoint/config/AclConfig.java b/src/main/java/nl/dtls/fairdatapoint/config/AclConfig.java index 2638b5472..1603d71bd 100644 --- a/src/main/java/nl/dtls/fairdatapoint/config/AclConfig.java +++ b/src/main/java/nl/dtls/fairdatapoint/config/AclConfig.java @@ -33,14 +33,14 @@ import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; import org.springframework.security.acls.AclPermissionCacheOptimizer; import org.springframework.security.acls.AclPermissionEvaluator; -import org.springframework.security.acls.dao.AclRepository; +import com.github.fairdatateam.security.acls.dao.AclRepository; import org.springframework.security.acls.domain.*; import org.springframework.security.acls.jdbc.LookupStrategy; import org.springframework.security.acls.model.AclCache; import org.springframework.security.acls.model.AclService; import org.springframework.security.acls.model.PermissionGrantingStrategy; -import org.springframework.security.acls.mongodb.BasicLookupStrategy; -import org.springframework.security.acls.mongodb.MongoDBMutableAclService; +import com.github.fairdatateam.security.acls.mongodb.BasicLookupStrategy; +import com.github.fairdatateam.security.acls.mongodb.MongoDBMutableAclService; import org.springframework.security.core.authority.SimpleGrantedAuthority; import static java.lang.String.format; diff --git a/src/main/java/nl/dtls/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java b/src/main/java/nl/dtls/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java index b439ca4cb..73e4f085b 100644 --- a/src/main/java/nl/dtls/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java +++ b/src/main/java/nl/dtls/fairdatapoint/database/mongo/migration/development/acl/AclMigration.java @@ -30,7 +30,7 @@ import nl.dtls.fairdatapoint.service.security.MongoAuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.security.acls.dao.AclRepository; +import com.github.fairdatateam.security.acls.dao.AclRepository; import org.springframework.security.acls.model.AclCache; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/member/MemberService.java b/src/main/java/nl/dtls/fairdatapoint/service/member/MemberService.java index acfd17341..54a1d88b0 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/member/MemberService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/member/MemberService.java @@ -34,13 +34,13 @@ import nl.dtls.fairdatapoint.service.user.CurrentUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.acls.dao.AclRepository; +import com.github.fairdatateam.security.acls.dao.AclRepository; import org.springframework.security.acls.domain.BasePermission; -import org.springframework.security.acls.domain.MongoAcl; +import com.github.fairdatateam.security.acls.domain.MongoAcl; import org.springframework.security.acls.domain.ObjectIdentityImpl; import org.springframework.security.acls.domain.PrincipalSid; import org.springframework.security.acls.model.*; -import org.springframework.security.acls.mongodb.MongoDBMutableAclService; +import com.github.fairdatateam.security.acls.mongodb.MongoDBMutableAclService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/reset/FactoryDefaults.java b/src/main/java/nl/dtls/fairdatapoint/service/reset/FactoryDefaults.java index a44b39791..c3023ca79 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/reset/FactoryDefaults.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/reset/FactoryDefaults.java @@ -437,7 +437,7 @@ public static Document aclRepository(String persistentUrl) { .append(FIELD_AUDIT_FAILURE, false) .append(FIELD_AUDIT_SUCCESS, false)); acl.append("permissions", permissions); - acl.append("_class", "org.springframework.security.acls.domain.MongoAcl"); + acl.append("_class", "com.github.fairdatateam.security.acls.domain.MongoAcl"); return acl; } diff --git a/src/main/java/nl/dtls/fairdatapoint/service/reset/ResetService.java b/src/main/java/nl/dtls/fairdatapoint/service/reset/ResetService.java index 0879a829b..a78f53791 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/reset/ResetService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/reset/ResetService.java @@ -43,7 +43,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.acls.dao.AclRepository; +import com.github.fairdatateam.security.acls.dao.AclRepository; import org.springframework.security.acls.model.AclCache; import org.springframework.stereotype.Service; diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/List_POST.java b/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/List_POST.java index 73ae3f2b7..3c4fba19b 100644 --- a/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/List_POST.java +++ b/src/test/java/nl/dtls/fairdatapoint/acceptance/metadata/catalog/List_POST.java @@ -36,7 +36,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; -import org.springframework.security.acls.dao.AclRepository; +import com.github.fairdatateam.security.acls.dao.AclRepository; import org.springframework.security.acls.model.AclCache; import java.net.URI;