Merge pull request #507 from apache/SHIRO-895_guice_java17_build

[SHIRO-895] Workaround Guice Java17 compat and run tests on 17.
apache · Oct 26, 2022 · 396c88f · 396c88f
2 parents c656056 + f5f1098
commit 396c88f
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 17 deletions.
diff --git 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/[email protected]
 
-      - name: Set up cache for ~./m2/repository
-        uses: actions/[email protected]
-        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/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
@@ -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/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
@@ -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>
diff --git 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>