This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/main by this push:
new 39192e3 [SHIRO-828] update aspectj-maven-plugin
new a52171f Merge pull request #323 from
bmarwell/SHIRO-828_aspectj-maven-plugin_for-main
39192e3 is described below
commit 39192e3321ae9071b50c76cd393b7845bfe843b5
Author: Benjamin Marwell <[email protected]>
AuthorDate: Sun Sep 26 11:55:28 2021 +0200
[SHIRO-828] update aspectj-maven-plugin
---
pom.xml | 7 +------
samples/aspectj/pom.xml | 4 ----
support/aspectj/pom.xml | 20 ++++++++++++++++----
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 61204c9..049b174 100644
--- a/pom.xml
+++ b/pom.xml
@@ -401,14 +401,9 @@
<version>3.0.0-M2</version>
</plugin>
<plugin>
- <groupId>dev.aspectj</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <version>1.13.M3</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>
- -->
+ <version>1.14.0</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index f3a5cfb..5fc808c 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -34,12 +34,8 @@
<build>
<plugins>
<plugin>
- <groupId>dev.aspectj</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <!-- 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>
- -->
<configuration>
<aspectLibraries>
<aspectLibrary>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index 46190c4..10cb953 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -62,12 +62,24 @@
<build>
<plugins>
<plugin>
- <groupId>dev.aspectj</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <!-- 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>
- -->
+ <executions>
+ <execution>
+ <id>aspectj-compile</id>
+ <goals>
+ <goal>compile</goal>
+ <goal>test-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjtools</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
