From bc3b0e720daf3b0a482ecd429f48981d5111a714 Mon Sep 17 00:00:00 2001
From: Benjamin Marwell <bmarwell@apache.org>
Date: Sun, 26 Sep 2021 11:55:28 +0200
Subject: [PATCH 1/2] [SHIRO-828] update aspectj-maven-plugin

---
 pom.xml                 | 9 ++-------
 samples/aspectj/pom.xml | 4 ----
 support/aspectj/pom.xml | 4 ----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 923bec9c72..b0630fc0c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <!-- Compile 3rd party dependencies: -->
         <!-- Don't change this version without also changing the shiro-aspect and shiro-features
              modules' OSGi metadata: -->
-        <aspectj.version>1.9.4</aspectj.version>
+        <aspectj.version>1.9.7</aspectj.version>
         <cas.client.core.version>3.2.2</cas.client.core.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
         <commons.cli.version>1.4</commons.cli.version>
@@ -403,14 +403,9 @@
                     <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>
-                    -->
+                    <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 d6a87a709f..c6ecd2c35b 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -34,12 +34,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>com.nickwongdev</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 fb5b9c5414..04b0d84f2d 100644
--- a/support/aspectj/pom.xml
+++ b/support/aspectj/pom.xml
@@ -62,12 +62,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.nickwongdev</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>

From bfe8aad1c72ae1ce3c1432d8effe9e32cd7874f3 Mon Sep 17 00:00:00 2001
From: Benjamin Marwell <bmarwell@apache.org>
Date: Tue, 28 Sep 2021 15:12:28 +0200
Subject: [PATCH 2/2] [SHIRO-828] update java runtimes.

---
 .github/workflows/maven.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 724615cb49..aa2782227a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up JDK
-        uses: actions/setup-java@v2.1.0
+        uses: actions/setup-java@v2
         with:
           java-version: 8
           distribution: adopt-hotspot
@@ -65,12 +65,12 @@ jobs:
             dist: adopt-openj9
           - version: 11
             dist: zulu
-          # 16
-          - version: 16
+          # 14
+          - version: 14
             dist: adopt-hotspot
-          - version: 16
+          - version: 14
             dist: adopt-openj9
-          - version: 16
+          - version: 14
             dist: zulu
         exclude:
           # was already built
@@ -107,7 +107,7 @@ jobs:
             maven-${{ matrix.os }}-
 
       - name: Set up JDK
-        uses: actions/setup-java@v2.1.0
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java.version }}
           distribution: ${{ matrix.java.dist }}