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/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 @@ test + + + + jdk16 + + [16,) + + + + --illegal-access=permit + --illegal-access=permit + + + + jdk17 + + [17,) + + + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + + + 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 @@ test + + + + jdk16 + + [16,) + + + + --illegal-access=permit + --illegal-access=permit + + + + jdk17 + + [17,) + + + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + + + diff --git a/pom.xml b/pom.xml index 46cf099ace..25015345fc 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 2.65.1 - 4.3 + 5.0.1 1.13.1 2.5.18 4.13.2 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 @@ test + + + + jdk16 + + [16,) + + + + --illegal-access=permit + --illegal-access=permit + + + + jdk17 + + [17,) + + + + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + + + 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 @@ + + + + jdk16 + + [16,17) + + + + --illegal-access=permit + + + + jdk17 + + [17,) + + + + --add-opens java.base/java.lang=ALL-UNNAMED + + + 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 @@ [8,) - --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED - --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + --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 + --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