You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2020/02/03 17:01:56 UTC

[shiro] branch bump-aspectj-plugin-version created (now e555cd3)

This is an automated email from the ASF dual-hosted git repository.

bdemers pushed a change to branch bump-aspectj-plugin-version
in repository https://gitbox.apache.org/repos/asf/shiro.git.


      at e555cd3  Update apsectj-maven-plugin version

This branch includes the following new commits:

     new e555cd3  Update apsectj-maven-plugin version

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[shiro] 01/01: Update apsectj-maven-plugin version

Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bdemers pushed a commit to branch bump-aspectj-plugin-version
in repository https://gitbox.apache.org/repos/asf/shiro.git

commit e555cd3c662f00d16b0932c29969bfa70cd87138
Author: Brian Demers <bd...@apache.org>
AuthorDate: Mon Feb 3 12:01:42 2020 -0500

    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 ed4f5ea..e080a0e 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 b63e2bd..cebe2ec 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 4659dc8..9fc7edc 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>