From e555cd3c662f00d16b0932c29969bfa70cd87138 Mon Sep 17 00:00:00 2001
From: Brian Demers <bdemers@apache.org>
Date: Mon, 3 Feb 2020 12:01:42 -0500
Subject: [PATCH] Update apsectj-maven-plugin version

Move plugin version and basic config to plugin management
---
 pom.xml                 | 16 ++++++++++++++++
 samples/aspectj/pom.xml |  6 ------
 support/aspectj/pom.xml |  8 --------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed4f5eab00..e080a0e25d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,6 +393,22 @@
                     <artifactId>maven-enforcer-plugin</artifactId>
                     <version>3.0.0-M2</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.nickwongdev</groupId>
+                    <artifactId>aspectj-maven-plugin</artifactId>
+                    <version>1.12.6</version>
+                    <!-- Using a fork, until such time that the aspect-maven-plugin updates to support JDK 11 - https://github.com/mojohaus/aspectj-maven-plugin/pull/45
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>aspectj-maven-plugin</artifactId>
+                    <version>1.11</version>
+                    -->
+                    <configuration>
+                        <source>${jdk.version}</source>
+                        <target>${jdk.version}</target>
+                        <complianceLevel>${jdk.version}</complianceLevel>
+                        <showWeaveInfo>true</showWeaveInfo>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index b63e2bd4be..cebe2ecc39 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -36,17 +36,11 @@
 			<plugin>
 				<groupId>com.nickwongdev</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.12.1</version>
 				<!-- Using a fork, until such time that the aspect-maven-plugin updates to support JDK 11 - https://github.com/mojohaus/aspectj-maven-plugin/pull/45
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.11</version>
 				-->
 				<configuration>
-					<source>${jdk.version}</source>
-					<target>${jdk.version}</target>
-					<complianceLevel>${jdk.version}</complianceLevel>
-					<showWeaveInfo>true</showWeaveInfo>
 					<aspectLibraries>
 						<aspectLibrary>
 							<groupId>org.apache.shiro</groupId>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index 4659dc8dde..9fc7edc8b8 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -64,18 +64,10 @@
             <plugin>
                 <groupId>com.nickwongdev</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.12.1</version>
                 <!-- Using a fork, until such time that the aspect-maven-plugin updates to support JDK 11 - https://github.com/mojohaus/aspectj-maven-plugin/pull/45
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.11</version>
                 -->
-                <configuration>
-                    <source>${jdk.version}</source>
-                    <target>${jdk.version}</target>
-                    <complianceLevel>${jdk.version}</complianceLevel>
-                    <showWeaveInfo>true</showWeaveInfo>
-                </configuration>
                 <executions>
                     <execution>
                         <id>aspectj-compile</id>