This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new dd6c678 Updating aspectj maven plugin
new e610f6b Merge pull request #158 from coheigea/aspectj-maven
dd6c678 is described below
commit dd6c678ae9c34a51937eb06f81519a30cd2cd9b4
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Jun 28 13:29:02 2019 +0100
Updating aspectj maven plugin
---
samples/aspectj/pom.xml | 7 ++++---
samples/spring-mvc/pom.xml | 5 -----
support/aspectj/pom.xml | 7 ++++---
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index e219ead..38dcf22 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -36,10 +36,11 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.11</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+
<complianceLevel>${jdk.version}</complianceLevel>
<showWeaveInfo>true</showWeaveInfo>
<aspectLibraries>
<aspectLibrary>
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index 10149fe..6ac176f 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -36,10 +36,6 @@
as the web start application.
</description>
- <properties>
- <jetty.version>9.4.0.v20161208</jetty.version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -82,7 +78,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.0.0</version>
<configuration>
<webResources>
<resource>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index ae00389..a543b23 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -64,10 +64,11 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.11</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ <complianceLevel>${jdk.version}</complianceLevel>
<showWeaveInfo>true</showWeaveInfo>
</configuration>
<executions>
