From 19bf4c136bf9dbdd98be72d817a19d3416f73a2e Mon Sep 17 00:00:00 2001
From: Arik Hadas <arik.hadas@openu.ac.il>
Date: Tue, 30 Jun 2015 08:45:30 +0300
Subject: [PATCH] revent last patch - maven connector for AspectJ should be
 used instead

This reverts commit a1cbad002da12b01a7ff1568b84948b8999b84ce.
---
 acoolm/pom.xml   |  2 --
 aspectjm/pom.xml |  2 --
 cjpf/pom.xml     |  2 --
 cjpm/pom.xml     |  2 --
 coolf/pom.xml    |  2 --
 coolm/pom.xml    |  2 --
 ejpf/pom.xml     |  2 --
 ejpm/pom.xml     | 14 ++++++--------
 frontend/pom.xml |  2 --
 platform/pom.xml |  2 --
 10 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/acoolm/pom.xml b/acoolm/pom.xml
index 42c87c1..55e831f 100644
--- a/acoolm/pom.xml
+++ b/acoolm/pom.xml
@@ -9,14 +9,12 @@
 	<artifactId>acoolm</artifactId>
 
 	<build>
-	  <pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
-	  </pluginManagement>
 	</build>
 
 	<dependencies>
diff --git a/aspectjm/pom.xml b/aspectjm/pom.xml
index 4ae3066..76d3015 100644
--- a/aspectjm/pom.xml
+++ b/aspectjm/pom.xml
@@ -9,14 +9,12 @@
   <artifactId>aspectjm</artifactId>
 
   <build>
-   <pluginManagement>
     <plugins>
       <plugin>
 	<groupId>org.codehaus.mojo</groupId>
 	<artifactId>aspectj-maven-plugin</artifactId>
       </plugin>
     </plugins>
-   </pluginManagement>
   </build>
 
   <dependencies>
diff --git a/cjpf/pom.xml b/cjpf/pom.xml
index 2b1768f..3174233 100644
--- a/cjpf/pom.xml
+++ b/cjpf/pom.xml
@@ -9,14 +9,12 @@
   <name>cjpf</name>
 
 	<build>
-	  <pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
-	  </pluginManagement>
 	</build>
 
 	<dependencies>
diff --git a/cjpm/pom.xml b/cjpm/pom.xml
index d07d015..86fd426 100644
--- a/cjpm/pom.xml
+++ b/cjpm/pom.xml
@@ -9,14 +9,12 @@
   <name>cjpm</name>
 
   <build>
-   <pluginManagement>
 	<plugins>
 		<plugin>
 			<groupId>org.codehaus.mojo</groupId>
 			<artifactId>aspectj-maven-plugin</artifactId>
 		</plugin>
 	</plugins>
-   </pluginManagement>
   </build>
 
   <dependencies>
diff --git a/coolf/pom.xml b/coolf/pom.xml
index f8d1491..0af8ed7 100644
--- a/coolf/pom.xml
+++ b/coolf/pom.xml
@@ -9,14 +9,12 @@
 	<artifactId>coolf</artifactId>
 
 	<build>
-	  <pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
-	  </pluginManagement>
 	</build>
 
 	<dependencies>
diff --git a/coolm/pom.xml b/coolm/pom.xml
index 5ef0577..5907b40 100644
--- a/coolm/pom.xml
+++ b/coolm/pom.xml
@@ -9,14 +9,12 @@
 	<artifactId>coolm</artifactId>
 
 	<build>
-	  <pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
-	  </pluginManagement>
 	</build>
 
 	<dependencies>
diff --git a/ejpf/pom.xml b/ejpf/pom.xml
index 354fcb5..5a7df64 100644
--- a/ejpf/pom.xml
+++ b/ejpf/pom.xml
@@ -8,14 +8,12 @@
   <artifactId>ejpf</artifactId>
 
 	<build>
-	  <pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
-	  </pluginManagement>
 	</build>
 
 	<dependencies>
diff --git a/ejpm/pom.xml b/ejpm/pom.xml
index c728a9b..95e1cdb 100644
--- a/ejpm/pom.xml
+++ b/ejpm/pom.xml
@@ -8,14 +8,12 @@
   <artifactId>ejpm</artifactId>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>aspectj-maven-plugin</artifactId>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>aspectj-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
 	</build>
 
 	<dependencies>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index a8176a1..fd44e21 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -9,7 +9,6 @@
   <artifactId>frontend</artifactId>
 
   <build>
-   <pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -25,7 +24,6 @@
         </configuration>
       </plugin>
     </plugins>
-   </pluginManagement>
   </build>
 
   <dependencies>
diff --git a/platform/pom.xml b/platform/pom.xml
index 29abbbf..497d530 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -9,7 +9,6 @@
   <artifactId>platform</artifactId>
 
   <build>
-   <pluginManagement>
     <plugins>
       <plugin>
 	<groupId>org.codehaus.mojo</groupId>
@@ -24,7 +23,6 @@
         </configuration>
       </plugin>
     </plugins>
-   </pluginManagement>
   </build>
 
   <dependencies>