chore: Build binaries with Java 21 (#477)

* chore: Build binaries with Java 23 * chore: Enable verbose logging for Pitest * test: Disable Wiremocks chunked encoding * chore: Attempt Java 21 * chore: Cleanup * chore: Bump Intel/Mac builds to macOS-13 * chore: Disable verbose PIT output
mthmulders · Jan 17, 2025 · 6997608 · 6997608
1 parent 7249174
commit 6997608
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4.5.0
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
         cache: maven
     - name: Cache Maven packages

diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -17,12 +17,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ ubuntu-latest, macOS-12, macos-14, windows-latest ]
+        os: [ ubuntu-latest, macos-13, macos-14, windows-latest ]
         gu-binary: [ gu, gu.cmd ]
         exclude:
           - os: ubuntu-latest
             gu-binary: gu.cmd
-          - os: macOS-12
+          - os: macos-13
             gu-binary: gu.cmd
           - os: macos-14
             gu-binary: gu.cmd
@@ -47,9 +47,7 @@ jobs:
         uses: graalvm/setup-graalvm@v1.2.2
         with:
           distribution: 'graalvm'
-          java-version: 17
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          java-version: 21
 
       - name: Get musl toolchain and compile libz against it
         id: prepare-musl
@@ -134,7 +132,7 @@ jobs:
 
       - name: Move build artifacts to correct folder
         run: |
-          targets=("ubuntu-latest" "macOS-latest" "macos-14" "windows-latest")
+          targets=("ubuntu-latest" "macos-13" "macos-14" "windows-latest")
           
           mkdir -p artifacts
           

diff --git a/.github/workflows/mutation-testing.yml b/.github/workflows/mutation-testing.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4.5.0
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
           cache: maven
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4.5.0
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
 
       - name: Cache Maven packages
@@ -70,12 +70,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ ubuntu-latest, macOS-12, macos-14, windows-latest ]
+        os: [ ubuntu-latest, macos-13, macos-14, windows-latest ]
         gu-binary: [ gu, gu.cmd ]
         exclude:
           - os: ubuntu-latest
             gu-binary: gu.cmd
-          - os: macOS-12
+          - os: macos-13
             gu-binary: gu.cmd
           - os: macos-14
             gu-binary: gu.cmd
@@ -106,9 +106,7 @@ jobs:
         uses: graalvm/setup-graalvm@v1.2.2
         with:
           distribution: 'graalvm'
-          java-version: 17
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          java-version: 21
 
       - name: Get musl toolchain and compile libz against it
         id: prepare-musl
@@ -208,7 +206,7 @@ jobs:
 
       - name: Move build artifacts to correct folder
         run: |
-          targets=("ubuntu-latest" "macOS-latest" "macos-14" "windows-latest")
+          targets=("ubuntu-latest" "macos-13" "macos-14" "windows-latest")
           
           mkdir -p artifacts
           
@@ -217,7 +215,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4.5.0
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
 
       - name: Cache Maven packages

diff --git a/src/test/java/it/mulders/mcs/search/SearchClientIT.java b/src/test/java/it/mulders/mcs/search/SearchClientIT.java
@@ -5,9 +5,10 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.ok;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 
-import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
-import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import com.github.tomakehurst.wiremock.core.Options;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import it.mulders.mcs.common.Result;
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,10 +21,19 @@
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-@WireMockTest
 class SearchClientIT implements WithAssertions {
+    @RegisterExtension
+    static WireMockExtension wiremock = WireMockExtension.newInstance()
+            .options(wireMockConfig()
+                    .bindAddress("localhost")
+                    .dynamicPort()
+                    .useChunkedTransferEncoding(Options.ChunkedEncodingPolicy.NEVER))
+            .configureStaticDsl(true)
+            .build();
+
     String getResourceAsString(final String resourceName) {
         try (final InputStream input = getClass().getResourceAsStream(resourceName)) {
             byte[] bytes = input != null ? input.readAllBytes() : new byte[] {};
@@ -37,8 +47,9 @@ String getResourceAsString(final String resourceName) {
     @DisplayName("Wildcard search")
     class WildcardSearchTest {
         @Test
-        void should_parse_response(final WireMockRuntimeInfo wmRuntimeInfo) {
+        void should_parse_response() {
             // Arrange
+            var wmRuntimeInfo = wiremock.getRuntimeInfo();
             stubFor(get(urlPathMatching("/solrsearch/select*"))
                     .willReturn(ok(getResourceAsString("/wildcard-search-response.json"))));
 
@@ -62,8 +73,9 @@ void should_parse_response(final WireMockRuntimeInfo wmRuntimeInfo) {
     @Nested
     class SingularSearchTest {
         @Test
-        void should_parse_response_groupId_artifactId(final WireMockRuntimeInfo wmRuntimeInfo) {
+        void should_parse_response_groupId_artifactId() {
             // Arrange
+            var wmRuntimeInfo = wiremock.getRuntimeInfo();
             stubFor(get(urlPathMatching("/solrsearch/select*"))
                     .willReturn(ok(getResourceAsString("/group-artifact-search.json"))));
 
@@ -83,8 +95,9 @@ void should_parse_response_groupId_artifactId(final WireMockRuntimeInfo wmRuntim
         }
 
         @Test
-        void should_parse_response_groupId_artifactId_version(final WireMockRuntimeInfo wmRuntimeInfo) {
+        void should_parse_response_groupId_artifactId_version() {
             // Arrange
+            var wmRuntimeInfo = wiremock.getRuntimeInfo();
             stubFor(get(urlPathMatching("/solrsearch/select*"))
                     .willReturn(ok(getResourceAsString("/group-artifact-version-search.json"))));
 
@@ -108,9 +121,10 @@ void should_parse_response_groupId_artifactId_version(final WireMockRuntimeInfo
     @Nested
     class ErrorHandlingTest {
         @Test
-        void should_gracefully_handle_4xx_response(final WireMockRuntimeInfo wmRuntimeInfo) {
+        void should_gracefully_handle_4xx_response() {
             // Arrange
-            stubFor(get(urlPathMatching("/solrsearch/select*"))
+            var wmRuntimeInfo = wiremock.getRuntimeInfo();
+            wiremock.stubFor(get(urlPathMatching("/solrsearch/select*"))
                     .willReturn(badRequest().withBody("Solr returned 400, msg: ")));
 
             // Act