Merge pull request #200 from apache/bump-aspectj-plugin-version

Update apsectj-maven-plugin version
apache · Feb 3, 2020 · 46583f2 · 46583f2
2 parents 9786f90 + e555cd3
commit 46583f2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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>