diff --git a/pom.xml b/pom.xml
index 89f0fbb78e..c33547ccd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
         <dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
         <dependency.acs-event-model.version>0.0.23</dependency.acs-event-model.version>
 
+        <dependency.aspectj.version>1.9.20.1</dependency.aspectj.version>
         <dependency.spring.version>6.0.9</dependency.spring.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
         <dependency.jackson.version>2.15.2</dependency.jackson.version>
diff --git a/repository/pom.xml b/repository/pom.xml
index 5f9cebd1ef..fb0f9df9ef 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -726,7 +726,7 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.9.19</version>
+            <version>${dependency.aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
@@ -870,9 +870,9 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.github.m50d</groupId>
+                <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.11.1</version>
+                <version>1.14.0</version>
                 <executions>
                     <execution>
                         <!-- phase>process-sources</phase -->
@@ -890,6 +890,13 @@
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjtools</artifactId>
+                        <version>${dependency.aspectj.version}</version>
+                    </dependency>
+                </dependencies>
            </plugin>
 
             <plugin>
diff --git a/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
index 404d8c9dc5..f91fb80921 100644
--- a/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
+++ b/repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
@@ -196,7 +196,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
      * @param plugins list of plugins
      *
      */
-    public void setPlugins(Interceptor[] plugins) {
+    public void setPlugins(Interceptor... plugins) {
         this.plugins = plugins;
     }
 
@@ -244,7 +244,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
      *
      * @param typeHandlers Type handler list
      */
-    public void setTypeHandlers(TypeHandler<?>[] typeHandlers) {
+    public void setTypeHandlers(TypeHandler<?>... typeHandlers) {
         this.typeHandlers = typeHandlers;
     }
 
@@ -255,7 +255,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
      *
      * @param typeAliases Type aliases list
      */
-    public void setTypeAliases(Class<?>[] typeAliases) {
+    public void setTypeAliases(Class<?>... typeAliases) {
         this.typeAliases = typeAliases;
     }
 
@@ -288,7 +288,7 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
      * This property being based on Spring's resource abstraction also allows for specifying
      * resource patterns here: e.g. "classpath*:sqlmap/*-mapper.xml".
      */
-    public void setMapperLocations(Resource[] mapperLocations) {
+    public void setMapperLocations(Resource... mapperLocations) {
         this.mapperLocations = mapperLocations;
     }
 
diff --git a/repository/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java
index 6eb8544248..60dd350f1f 100644
--- a/repository/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java
+++ b/repository/src/main/java/org/alfresco/repo/management/subsystems/ChainingSubsystemProxyFactory.java
@@ -156,7 +156,7 @@ public class ChainingSubsystemProxyFactory extends ProxyFactoryBean
      */
     @SuppressWarnings("rawtypes")
     @Override
-    public void setInterfaces(Class[] interfaces)
+    public void setInterfaces(Class... interfaces)
     {
         super.setInterfaces(interfaces);
         // Make it possible to export the object via JMX
diff --git a/repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java b/repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
index ee75535774..e0c5868e3e 100644
--- a/repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
+++ b/repository/src/main/java/org/alfresco/repo/management/subsystems/SubsystemProxyFactory.java
@@ -89,7 +89,7 @@ public class SubsystemProxyFactory extends ProxyFactoryBean implements Applicati
 
     @SuppressWarnings("unchecked")
     @Override
-    public void setInterfaces(Class[] interfaces)
+    public void setInterfaces(Class... interfaces)
     {
         super.setInterfaces(interfaces);
         // Make it possible to export the object via JMX