From 3f0e73170d68c036c9f591794ed5071d690a345f Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 14 Oct 2024 22:03:34 +0200 Subject: [PATCH 1/4] pom replace nexus repository with github packages --- pom.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9882b468..35a18ac5 100644 --- a/pom.xml +++ b/pom.xml @@ -93,14 +93,15 @@ - nexus-releases - Nexus Releases - https://nexus.internal.fairdatapoint.org/repository/maven-releases/ - - - nexus-snapshots - Nexus Snapshots - https://nexus.internal.fairdatapoint.org/repository/maven-snapshots/ + + + + github-packages + Github Packages + https://maven.pkg.github.com/${env.GITHUB_REPOSITORY_OWNER}/* + + true + From b63a3283b6747b4f89ba5c3eecfbcbe1be0b6085 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 14 Oct 2024 22:04:20 +0200 Subject: [PATCH 2/4] replace fairdevkit references by fairdatateam --- pom.xml | 4 ++-- .../nl/dtls/fairdatapoint/service/label/LabelService.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 35a18ac5..b0df4fd1 100644 --- a/pom.xml +++ b/pom.xml @@ -249,12 +249,12 @@ ${lombok.version} - com.github.fairdevkit + com.github.fairdatateam rdf-resource-resolver-core ${rdf-resolver.version} - com.github.fairdevkit + com.github.fairdatateam rdf-resource-resolver-api ${rdf-resolver.version} diff --git a/src/main/java/nl/dtls/fairdatapoint/service/label/LabelService.java b/src/main/java/nl/dtls/fairdatapoint/service/label/LabelService.java index 5ec1b0dc..cd2ff798 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/label/LabelService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/label/LabelService.java @@ -25,10 +25,10 @@ import static java.util.function.Predicate.isEqual; import static nl.dtls.fairdatapoint.config.CacheConfig.LABEL_CACHE; import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i; -import com.github.fairdevkit.rdf.resolver.api.ResourceResolver; -import com.github.fairdevkit.rdf.resolver.core.ContentNegotiationStrategy; -import com.github.fairdevkit.rdf.resolver.core.CoreResourceResolver; -import com.github.fairdevkit.rdf.resolver.core.PathExtensionStrategy; +import com.github.fairdatateam.rdf.resolver.api.ResourceResolver; +import com.github.fairdatateam.rdf.resolver.core.ContentNegotiationStrategy; +import com.github.fairdatateam.rdf.resolver.core.CoreResourceResolver; +import com.github.fairdatateam.rdf.resolver.core.PathExtensionStrategy; import java.util.Optional; import lombok.extern.slf4j.Slf4j; From a4c2c48accd9c273d984654414a06b3acca20498 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:35:16 +0200 Subject: [PATCH 3/4] pom upgrade to latest lombok for JDK 21 compat --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b0df4fd1..8eb49743 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 4.1.1 4.3.2 0.11.5 - 1.18.28 + 1.18.34 0.1.2-SNAPSHOT From 121037778140d33468ca9e222c6af575e4a41c9d Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:37:42 +0200 Subject: [PATCH 4/4] update spring-security-acl-mongodb references to com.github.fairdatateam --- pom.xml | 2 +- src/main/java/nl/dtls/fairdatapoint/config/AclConfig.java | 6 +++--- .../mongo/migration/development/acl/AclMigration.java | 2 +- .../nl/dtls/fairdatapoint/service/member/MemberService.java | 6 +++--- .../dtls/fairdatapoint/service/reset/FactoryDefaults.java | 2 +- .../nl/dtls/fairdatapoint/service/reset/ResetService.java | 2 +- .../acceptance/metadata/catalog/List_POST.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 8eb49743..278fa236 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 2638b547..1603d71b 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 b439ca4c..73e4f085 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 acfd1734..54a1d88b 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 a44b3979..c3023ca7 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 0879a829..a78f5379 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 73ae3f2b..3c4fba19 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;