From 5e5bcb102a59dcccfc96b51bb40b2eeca41fef28 Mon Sep 17 00:00:00 2001
From: Benjamin Marwell <bmarwell@apache.org>
Date: Tue, 25 Oct 2022 16:39:57 +0200
Subject: [PATCH 1/3] [SHIRO-894] Update EasyMock to 5.0.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 46cf099ace..25015345fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
         <htmlunit.version>2.65.1</htmlunit.version>
 
         <!-- Test 3rd-party dependencies: -->
-        <easymock.version>4.3</easymock.version>
+        <easymock.version>5.0.1</easymock.version>
         <gmaven.version>1.13.1</gmaven.version>
         <groovy.version>2.5.18</groovy.version>
         <junit.version>4.13.2</junit.version>

From ca3925552345a988307b4a32d54ee8f59033bb0a Mon Sep 17 00:00:00 2001
From: Benjamin Marwell <bmarwell@apache.org>
Date: Tue, 25 Oct 2022 16:44:34 +0200
Subject: [PATCH 2/3] [SHIRO-895] Workaround Guice Java17 compat and run tests
 on 17.

---
 .github/workflows/maven.yml | 19 ++++---------------
 samples/guice/pom.xml       | 25 +++++++++++++++++++++++++
 support/guice/pom.xml       | 23 +++++++++++++++++++++++
 3 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f794cb8be6..da93de6564 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -66,11 +66,11 @@ jobs:
           - version: 11
             dist: zulu
           # 14
-          - version: 14
+          - version: 17
             dist: adopt-hotspot
-          - version: 14
+          - version: 17
             dist: adopt-openj9
-          - version: 14
+          - version: 17
             dist: zulu
         exclude:
           # was already built
@@ -82,7 +82,7 @@ jobs:
           # excludes java 16 on macOS.
           - os: macOS-latest
             java:
-              version: 16
+              version: 11
           # exclude adopt-hotspot on MacOS. zulu (also hotspot) and OpenJ9 are sufficient.
           - os: macOS-latest
             java:
@@ -95,17 +95,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3.1.0
 
-      - name: Set up cache for ~./m2/repository
-        uses: actions/cache@v3.0.10
-        with:
-          path: |
-            ~/.m2/repository
-            !~/.m2/repository/org/apache/shiro
-          key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            maven-${{ matrix.os }}-java${{ matrix.java }}-
-            maven-${{ matrix.os }}-
-
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml
index 15e9f69c64..d759ed44b0 100644
--- a/samples/guice/pom.xml
+++ b/samples/guice/pom.xml
@@ -111,4 +111,29 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>jdk16</id>
+			<activation>
+				<jdk>[16,)</jdk>
+			</activation>
+			<properties>
+				<!-- needed by guice until it is compatible with jdk16+. -->
+				<surefire.argLine>--illegal-access=permit</surefire.argLine>
+				<failsafe.argLine>--illegal-access=permit</failsafe.argLine>
+			</properties>
+		</profile>
+		<profile>
+			<id>jdk17</id>
+			<activation>
+				<jdk>[17,)</jdk>
+			</activation>
+			<properties>
+				<!-- needed by guice until it is compatible with jdk17+. -->
+				<surefire.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argLine>
+				<failsafe.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</failsafe.argLine>
+			</properties>
+		</profile>
+	</profiles>
 </project>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 5f94b89b86..fd41294fdc 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -120,4 +120,27 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>jdk16</id>
+            <activation>
+                <jdk>[16,17)</jdk>
+            </activation>
+            <properties>
+                <!-- needed by guice until it is compatible with jdk16+. -->
+                <surefire.argLine>--illegal-access=permit</surefire.argLine>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk17</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <properties>
+                <!-- needed by guice until it is compatible with jdk17+. -->
+                <surefire.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argLine>
+            </properties>
+        </profile>
+    </profiles>
 </project>

From f5f10982ed0984f042927c6056adfae663266eb9 Mon Sep 17 00:00:00 2001
From: Benjamin Marwell <bmarwell@apache.org>
Date: Tue, 25 Oct 2022 23:40:38 +0200
Subject: [PATCH 3/3] [SHIRO-895] hazelcast/powermock/guice Java17 compat

---
 integration-tests/guice3/pom.xml | 25 +++++++++++++++++++++++++
 integration-tests/guice4/pom.xml | 25 +++++++++++++++++++++++++
 support/hazelcast/pom.xml        |  4 ++--
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml
index 0e0dc4122d..e665270447 100644
--- a/integration-tests/guice3/pom.xml
+++ b/integration-tests/guice3/pom.xml
@@ -123,4 +123,29 @@
 			<scope>test</scope>
         </dependency>
 	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>jdk16</id>
+			<activation>
+				<jdk>[16,)</jdk>
+			</activation>
+			<properties>
+				<!-- needed by guice until it is compatible with jdk16+. -->
+				<surefire.argLine>--illegal-access=permit</surefire.argLine>
+				<failsafe.argLine>--illegal-access=permit</failsafe.argLine>
+			</properties>
+		</profile>
+		<profile>
+			<id>jdk17</id>
+			<activation>
+				<jdk>[17,)</jdk>
+			</activation>
+			<properties>
+				<!-- needed by guice until it is compatible with jdk17+. -->
+				<surefire.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argLine>
+				<failsafe.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</failsafe.argLine>
+			</properties>
+		</profile>
+	</profiles>
 </project>
diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml
index 9fa0312c19..22759f0118 100644
--- a/integration-tests/guice4/pom.xml
+++ b/integration-tests/guice4/pom.xml
@@ -128,4 +128,29 @@
             <scope>test</scope>
         </dependency>
 	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>jdk16</id>
+			<activation>
+				<jdk>[16,)</jdk>
+			</activation>
+			<properties>
+				<!-- needed by guice until it is compatible with jdk16+. -->
+				<surefire.argLine>--illegal-access=permit</surefire.argLine>
+				<failsafe.argLine>--illegal-access=permit</failsafe.argLine>
+			</properties>
+		</profile>
+		<profile>
+			<id>jdk17</id>
+			<activation>
+				<jdk>[17,)</jdk>
+			</activation>
+			<properties>
+				<!-- needed by guice until it is compatible with jdk17+. -->
+				<surefire.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</surefire.argLine>
+				<failsafe.argLine>--add-opens java.base/java.lang=ALL-UNNAMED</failsafe.argLine>
+			</properties>
+		</profile>
+	</profiles>
 </project>
diff --git a/support/hazelcast/pom.xml b/support/hazelcast/pom.xml
index 3e30c5a1b4..7455c77dab 100644
--- a/support/hazelcast/pom.xml
+++ b/support/hazelcast/pom.xml
@@ -88,8 +88,8 @@
                 <jdk>[8,)</jdk>
             </activation>
             <properties>
-                <surefire.argLine> --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED</surefire.argLine>
-                <failsafe.argLine> --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED</failsafe.argLine>
+                <surefire.argLine> --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.ref=ALL-UNNAMED</surefire.argLine>
+                <failsafe.argLine> --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.ref=ALL-UNNAMED</failsafe.argLine>
             </properties>
         </profile>
     </profiles>