diff --git a/client/pom.xml b/client/pom.xml
index 7bbb7e8..77319a2 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -25,6 +25,11 @@
             <artifactId>args4j</artifactId>
         </dependency>
 
+        <dependency>
+          <groupId>org.aspectj</groupId>
+          <artifactId>aspectjrt</artifactId>
+        </dependency>
+	
         <!-- TEST -->
 
         <dependency>
@@ -45,7 +50,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.10</version>
+		<version>${version.aspectj-maven}</version>
                 <configuration>
                     <aspectLibraries>
                         <aspectLibrary>
diff --git a/core/pom.xml b/core/pom.xml
index 4f02e36..ec7cf4b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -76,7 +76,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.10</version>
+		<version>${version.aspectj-maven}</version>
                 <configuration>
                     <complianceLevel>1.8</complianceLevel>
                     <source>1.8</source>
diff --git a/pom.xml b/pom.xml
index ada2123..07ccf2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
         <version.java-uuid-generator>3.1.3</version.java-uuid-generator>
         <version.javaee-api>7.0</version.javaee-api>
         <version.aspectjrt>1.8.9</version.aspectjrt>
+	<version.aspectj-maven>1.10</version.aspectj-maven>
         <version.args4j>2.32</version.args4j>
         <version.javassist>3.23.1-GA</version.javassist>
         <version.testng>6.14.3</version.testng>
diff --git a/server/pom.xml b/server/pom.xml
index 7ef7e5c..640cb76 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -77,6 +77,11 @@
           <version>1.0.9.Final</version>
         </dependency>
 
+        <dependency>
+          <groupId>org.aspectj</groupId>
+          <artifactId>aspectjrt</artifactId>
+        </dependency>
+	
         <!-- TEST -->
 
         <dependency>
@@ -118,7 +123,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.10</version>
+		<version>${version.aspectj-maven}</version>
                 <configuration>
                     <aspectLibraries>
                         <aspectLibrary>