From f3c4ab59618ab5eca85f74676fe56f98cc065cd9 Mon Sep 17 00:00:00 2001
From: Jonathan Hedley <jonathan@hedley.net>
Date: Wed, 1 Nov 2023 17:25:02 +1100
Subject: [PATCH] Move the multi-release to a JDK9+ profile (#2027)

Allows JDK8 to build, albeit without multi-release / modules. Allows the CI actions to test on Java 8.

Fixes #2026
---
 .github/workflows/build.yml |  2 +-
 pom.xml                     | 54 ++++++++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c58141b258..7a4e6b6a78 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
         # choosing to run a reduced set of LTS, current, and next, to balance coverage and execution time
-        java: [11, 17, 21]
+        java: [8, 17, 21]
       fail-fast: false
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
     steps:
diff --git a/pom.xml b/pom.xml
index 79907101ec..60164f3153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,22 +60,8 @@
               <target>1.8</target>
             </configuration>
           </execution>
-          <execution>
-            <id>compile-java-9</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <release>9</release>
-              <compileSourceRoots>
-                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
-              </compileSourceRoots>
-              <multiReleaseOutput>true</multiReleaseOutput>
-            </configuration>
-          </execution>
+          <!-- There is a JDK 9+ profile execution below, which adds multi-release=true and compiles module-info -->
         </executions>
-
       </plugin>
 
       <!-- Ensure Java 8 and Android 10 API compatibility -->
@@ -300,6 +286,44 @@
   </distributionManagement>
 
   <profiles>
+    <!-- Compiles the multi-release jar when executed on JDK9+ -->
+    <profile>
+      <id>compile-multi-release</id>
+      <activation>
+        <jdk>[9,2000)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>compile-java-8</id>
+                <configuration>
+                  <release>8</release>
+                </configuration>
+              </execution>
+              <execution>
+                <id>compile-java-9</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <configuration>
+                  <release>9</release>
+                  <compileSourceRoots>
+                    <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+                  </compileSourceRoots>
+                  <multiReleaseOutput>true</multiReleaseOutput>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>release-sign-artifacts</id>
       <activation>