You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by fp...@apache.org on 2019/11/07 12:30:47 UTC

[shiro] branch master updated: Get the aspectj modules passing with JDK 11

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 a3c4043  Get the aspectj modules passing with JDK 11
     new 608f99a  Merge pull request #173 from coheigea/aspectj
a3c4043 is described below

commit a3c40438bd0a85c8afff86685f946942eea52d6e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Nov 7 10:22:19 2019 +0000

    Get the aspectj modules passing with JDK 11
---
 samples/aspectj/pom.xml | 5 +++++
 support/aspectj/pom.xml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index 38dcf22..f8d2298 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -34,9 +34,14 @@
 	<build>
 		<plugins>
 			<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>
diff --git a/support/aspectj/pom.xml b/support/aspectj/pom.xml
index a543b23..c786cbf 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -62,9 +62,14 @@
     <build>
         <plugins>
             <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>