From 32c4fabff093b11ad831180fe1bc061039501e71 Mon Sep 17 00:00:00 2001
From: AFaust <axel.faust@acosix.org>
Date: Sun, 16 Feb 2020 16:35:37 +0100
Subject: [PATCH] Some fixups

---
 repository/pom.xml                                              | 2 +-
 repository/src/main/{asembly => assembly}/amp.xml               | 1 +
 .../Authentication/keycloak/keycloak-authentication.properties  | 2 +-
 share/pom.xml                                                   | 2 +-
 share/src/main/assembly/amp.xml                                 | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename repository/src/main/{asembly => assembly}/amp.xml (98%)

diff --git a/repository/pom.xml b/repository/pom.xml
index fdc3c35..45cad3d 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>de.acosix.alfresco.keycloak.repo.deps</artifactId>
+            <artifactId>${project.artifactId}.deps</artifactId>
             <version>${project.version}</version>
             <exclusions>
                 <exclusion>
diff --git a/repository/src/main/asembly/amp.xml b/repository/src/main/assembly/amp.xml
similarity index 98%
rename from repository/src/main/asembly/amp.xml
rename to repository/src/main/assembly/amp.xml
index 4daec04..76210b3 100644
--- a/repository/src/main/asembly/amp.xml
+++ b/repository/src/main/assembly/amp.xml
@@ -47,6 +47,7 @@
             <includes>
                 <include>${project.groupId}:${project.artifactId}.deps:*</include>
             </includes>
+            <scope>compile</scope>
         </dependencySet>
     </dependencySets>
 </assembly>
diff --git a/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication.properties b/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication.properties
index 5a5cd02..e77124f 100644
--- a/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication.properties
+++ b/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication.properties
@@ -84,7 +84,7 @@ keycloak.roles.resourceMapper.default.static.property.nameMappings.map.search-ad
 keycloak.roles.resourceMapper.default.static.property.nameMappings.map.site-admin=GROUP_SITE_ADMINISTRATORS
 
 keycloak.roles.resourceMapper.default.prefix._parent=roleMapperPrefixBase
-keycloak.roles.resourceMapper.default.prefix.property.prefix=ROLE_KEYCLOAK_${keycloak.adapter.realm}_${keycloak.adapter.resource}
+keycloak.roles.resourceMapper.default.prefix.property.prefix=ROLE_KEYCLOAK_${keycloak.adapter.realm}_${keycloak.adapter.resource}_
 
 keycloak.synchronization.enabled=true
 keycloak.synchronization.user=
diff --git a/share/pom.xml b/share/pom.xml
index c1ba75c..57157f4 100644
--- a/share/pom.xml
+++ b/share/pom.xml
@@ -66,7 +66,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>de.acosix.alfresco.keycloak.share.deps</artifactId>
+            <artifactId>${project.artifactId}.deps</artifactId>
             <version>${project.version}</version>
             <exclusions>
                 <exclusion>
diff --git a/share/src/main/assembly/amp.xml b/share/src/main/assembly/amp.xml
index f099c97..fe08185 100644
--- a/share/src/main/assembly/amp.xml
+++ b/share/src/main/assembly/amp.xml
@@ -48,6 +48,7 @@
                 <include>org.bouncycastle:*</include>
                 <include>${project.groupId}:${project.artifactId}.deps:*</include>
             </includes>
+            <scope>compile</scope>
         </dependencySet>
     </dependencySets>
 </assembly>