Support/1.17.x

pom.xml

@@ -60,7 +60,7 @@
         <mongodb.spring-data.version>4.1.1</mongodb.spring-data.version>
         <rdf4j.version>4.3.2</rdf4j.version>
         <jwt.version>0.11.5</jwt.version>
-        <lombok.version>1.18.28</lombok.version>
+        <lombok.version>1.18.34</lombok.version>
         <rdf-resolver.version>0.1.2-SNAPSHOT</rdf-resolver.version>
 
         <!-- Test -->
@@ -93,14 +93,15 @@
             </snapshots>
         </repository>
         <repository>
-            <id>nexus-releases</id>
-            <name>Nexus Releases</name>
-            <url>https://nexus.internal.fairdatapoint.org/repository/maven-releases/</url>
-        </repository>
-        <repository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshots</name>
-            <url>https://nexus.internal.fairdatapoint.org/repository/maven-snapshots/</url>
+            <!-- https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry -->
+            <!-- https://docs.github.com/en/actions/security-for-github-actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow -->
+            <!-- use <id> to specify github PAT in ~/.m2/settings.xml <server> section: https://maven.apache.org/settings.html#servers -->
+            <id>github-packages</id>
+            <name>Github Packages</name>
+            <url>https://maven.pkg.github.com/${env.GITHUB_REPOSITORY_OWNER}/*</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
     </repositories>
 
@@ -173,7 +174,7 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.security</groupId>
+            <groupId>com.github.fairdatateam</groupId>
             <artifactId>spring-security-acl-mongodb</artifactId>
             <version>${spring.security.acl.mongo.version}</version>
         </dependency>
@@ -248,12 +249,12 @@
             <version>${lombok.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.github.fairdevkit</groupId>
+            <groupId>com.github.fairdatateam</groupId>
             <artifactId>rdf-resource-resolver-core</artifactId>
             <version>${rdf-resolver.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.github.fairdevkit</groupId>
+            <groupId>com.github.fairdatateam</groupId>
             <artifactId>rdf-resource-resolver-api</artifactId>
             <version>${rdf-resolver.version}</version>
         </dependency>

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;

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;

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;

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;

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;
     }
 

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;
 

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;