From 60c134e3bd3766e677e1b5e58790a9ffbda28cbd Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Wed, 6 Apr 2016 19:40:16 +0200
Subject: [PATCH] DATAJPA-883 - Fixed configuration of AspectJ Maven plugin.

We now enforce the AspectJ plugin to run no matter what to work around bugs in the plugin in combination with bugs in the compiler plugin.

https://github.com/mojohaus/aspectj-maven-plugin/issues/15
https://issues.apache.org/jira/browse/MCOMPILER-205
https://issues.apache.org/jira/browse/MCOMPILER-209
---
 pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c810ed944..0830594ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -454,7 +454,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.6</version>
+				<version>1.8</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.aspectj</groupId>
@@ -476,6 +476,15 @@
 				</executions>
 				<configuration>
 					<verbose>true</verbose>
+					<!--
+						To workaround:
+
+						- https://issues.apache.org/jira/browse/MCOMPILER-205
+						- https://issues.apache.org/jira/browse/MCOMPILER-209
+						- https://github.com/mojohaus/aspectj-maven-plugin/issues/15
+
+					-->
+					<forceAjcCompile>true</forceAjcCompile>
 					<aspectLibraries>
 						<aspectLibrary>
 							<groupId>org.springframework</groupId>