v1.4.0 pom

pom.xml

@@ -2,11 +2,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>keycloak-activiti-app-ext</artifactId>
-	<version>1.4-SNAPSHOT</version>
-
+	<version>1.4.0</version>
 	<name>Keycloak Authentication &amp; Authorization for APS</name>
 	<description>An Alfresco Process Service App extension providing improved Keycloak/AIS support.</description>
 	<url>https://bitbucket.org/inteligr8/keycloak-activiti-app-ext</url>
@@ -42,17 +40,30 @@
 		<maven.compiler.release>17</maven.compiler.release>
 
 		<aps.version>24.3.0</aps.version>
-		<keycloak.version>23.0.7</keycloak.version>
+		<keycloak.version>18.0.2</keycloak.version>
 		<spring-security-oauth2.version>6.3.2</spring-security-oauth2.version>
+		<slf4j.version>1.7.36</slf4j.version>
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-oauth2-client</artifactId>
 			<version>${spring-security-oauth2.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-spring-security-adapter</artifactId>
+			<version>${keycloak.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<!-- Needed for Activiti App Identity Service inheritance/override -->
 		<!-- includes activiti-app-logic for API -->
 		<dependency>
@@ -72,74 +83,8 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.keycloak</groupId>
-			<artifactId>keycloak-spring-security-adapter</artifactId>
-			<version>${keycloak.version}</version>
-			<exclusions>
-				<!-- provided by APS -->
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.jboss.logging</groupId>
-					<artifactId>jboss-logging</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>jakarta.activation</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.httpcomponents</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.bouncycastle</groupId>
-					<artifactId>bcprov-jdk18on</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.bouncycastle</groupId>
-					<artifactId>bcpkix-jdk18on</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 	</dependencies>
 	
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.6.0</version>
-				<executions>
-					<execution>
-						<id>shade-jar</id>
-						<goals><goal>shade</goal></goals>
-						<configuration>
-							<shadedArtifactAttached>true</shadedArtifactAttached>
-							<relocations>
-								<relocation>
-									<pattern></pattern>
-									<shadedPattern>shaded.keycloak.</shadedPattern>
-									<excludes>
-										<exclude>com.activiti.conf.**</exclude>
-										<exclude>com.activiti.extension.conf.**</exclude>
-										<exclude>com.inteligr8.activiti.**</exclude>
-										<exclude>META-INF/**/*</exclude>
-									</excludes>
-								</relocation>
-							</relocations>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	
 	<profiles>
 		<profile>
 			<id>ossrh-release</id>

src/main/java/com/activiti/conf/ActivitiOotbSecurityConfigurationAdapter.java

@@ -22,12 +22,12 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 
-import com.inteligr8.activiti.security.ActivitiSecurityConfigAdapter;
+import com.inteligr8.activiti.ActivitiSecurityConfigAdapter;
 
 /**
  * This class/bean executes the OOTB security configuration without the
  * override, so you can still use its OOTB features.  This will allow you to
- * enable/disable features, chain them, and unset the OOTB features as a
+ * enable/disable features, chain them, and uset he OOTB features as a
  * fallback or failsafe.
  * 
  * This class must be in the com.activiti.conf package so it can use protected

src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java

@@ -16,7 +16,6 @@ package com.activiti.extension.conf;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator;
 
 /**
  * A means for injecting packages to scan for the Spring context.
@@ -24,14 +23,7 @@ import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGe
  * @author brian@inteligr8.com
  */
 @Configuration
-@ComponentScan(
-    basePackages = {
-        "com.inteligr8.activiti.idm",
-        "com.inteligr8.activiti.keycloak",
-        "com.inteligr8.activiti.security"
-    },
-    nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class
-)
+@ComponentScan(basePackages = {"com.inteligr8.activiti"})
 public class KeycloakExtSpringComponentScanner {
 
 }

src/main/java/com/inteligr8/activiti/ActivitiAppAdminGroupFixer.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti.idm;
+package com.inteligr8.activiti;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,8 +32,6 @@ import com.activiti.domain.idm.Group;
 import com.activiti.domain.idm.GroupCapability;
 import com.activiti.domain.idm.Tenant;
 import com.activiti.service.api.GroupService;
-import com.inteligr8.activiti.DataFixer;
-import com.inteligr8.activiti.keycloak.TenantFinderService;
 
 /**
  * This class/bean attempts to fix the administrative group in APS.  This may

src/main/java/com/inteligr8/activiti/ActivitiAppAdminMembersFixer.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti.idm;
+package com.inteligr8.activiti;
 
 import java.util.Arrays;
 import java.util.List;
@@ -29,8 +29,6 @@ import com.activiti.domain.idm.Group;
 import com.activiti.domain.idm.User;
 import com.activiti.service.api.GroupService;
 import com.activiti.service.api.UserService;
-import com.inteligr8.activiti.DataFixer;
-import com.inteligr8.activiti.keycloak.TenantFinderService;
 
 /**
  * This class/bean attempts to add administrators to the administrative group

src/main/java/com/inteligr8/activiti/ActivitiAppAdminPasswordFixer.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti.idm;
+package com.inteligr8.activiti;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,8 +22,6 @@ import org.springframework.stereotype.Component;
 
 import com.activiti.domain.idm.User;
 import com.activiti.service.api.UserService;
-import com.inteligr8.activiti.DataFixer;
-import com.inteligr8.activiti.keycloak.TenantFinderService;
 
 /**
  * This class/bean attempts to reset the configured user's password.

src/main/java/com/inteligr8/activiti/ActivitiSecurityConfigAdapter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti.security;
+package com.inteligr8.activiti;
 
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.userdetails.UserDetailsService;

src/main/java/com/inteligr8/activiti/Inteligr8SecurityConfigurationRegistry.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti.security;
+package com.inteligr8.activiti;
 
 import java.util.Collections;
 import java.util.List;
@@ -25,7 +25,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 
 import com.activiti.api.security.AlfrescoSecurityConfigOverride;
-import com.inteligr8.activiti.DataFixer;
 
 /**
  * This class/bean overrides the APS security configuration with a collection

src/main/java/com/inteligr8/activiti/TenantFinderService.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti.keycloak;
+package com.inteligr8.activiti;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/com/inteligr8/activiti/keycloak/KeycloakActivitiAppAuthenticator.java

@@ -41,6 +41,7 @@ import com.activiti.domain.idm.Group;
 import com.activiti.domain.idm.User;
 import com.activiti.service.api.GroupService;
 import com.activiti.service.api.UserService;
+import com.inteligr8.activiti.TenantFinderService;
 
 /**
  * This class/bean implements an Open ID Connect authenticator for Alfresco

src/main/java/com/inteligr8/activiti/keycloak/KeycloakSecurityConfigurationAdapter.java

@@ -25,9 +25,9 @@ import org.springframework.security.core.authority.mapping.SimpleAuthorityMapper
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 
+import com.inteligr8.activiti.ActivitiSecurityConfigAdapter;
 import com.inteligr8.activiti.auth.Authenticator;
 import com.inteligr8.activiti.auth.InterceptingAuthenticationProvider;
-import com.inteligr8.activiti.security.ActivitiSecurityConfigAdapter;
 
 /**
  * This class/bean injects a custom keycloak authentication provider into the