Reorganize build to better support Java 11+

ibauersachs · ibauersachs · commit 097c636a7942 · 2021-08-03T23:29:47.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -83,7 +83,7 @@ jobs:
         with:
           java-version: '8'
           architecture: 'x64'
-          distribution: zulu
+          distribution: adopt
           server-id: ossrh
           server-username: SONATYPE_USER
           server-password: SONATYPE_PW
diff --git a/README.md b/README.md
@@ -260,7 +260,9 @@ until one succeeds.
   on the classpath, the `GetAdaptersAddresses` API is used.
 - On Android the `ConnectivityManager` is used (requires initialization using
   `org.xbill.DNS.config.AndroidResolverConfigProvider.setContext`).
-- The `sun.net.dns.ResolverConfiguration` class is queried if enabled.
+- The `sun.net.dns.ResolverConfiguration` class is queried if enabled. As of
+  Java 16 the JVM flag `--add-opens java.base/sun.net.dns=ALL-UNNAMED` is also
+  required.
 - If available and no servers have been found yet,
   [JNDI-DNS](https://docs.oracle.com/javase/8/docs/technotes/guides/jndi/jndi-dns.html) is used.
 - If still no servers have been found yet, use the fallback properties. This can be used to query
diff --git a/pom.xml b/pom.xml
@@ -90,9 +90,14 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>${target.jdk}</source>
-                    <target>${target.jdk}</target>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
 
@@ -426,23 +431,39 @@
     </dependencies>
 
     <profiles>
+        <profile>
+            <id>java8</id>
+            <activation>
+                <jdk>[,9)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <source>${target.jdk}</source>
+                            <target>${target.jdk}</target>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <!-- JDK9 removed the Nameservice SPI as per bug 8134577. There's no replacement. -->
             <id>no-spi-on-java9</id>
             <activation>
-                <jdk>[1.9,)</jdk>
+                <jdk>[9,)</jdk>
             </activation>
 
-            <properties>
-                <target.jdk>11</target.jdk>
-                <maven.compiler.release>${target.jdk}</maven.compiler.release>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
+                            <release>${target.jdk}</release>
                             <excludes>
                                 <exclude>org/xbill/DNS/spi/**</exclude>
                             </excludes>
@@ -456,6 +477,16 @@
                             <excludePackageNames>*.spi</excludePackageNames>
                         </configuration>
                     </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <argLine>
+                                --add-opens java.base/sun.net.dns=ALL-UNNAMED
+                            </argLine>
+                        </configuration>
+                    </plugin>
                 </plugins>
 
                 <resources>
diff --git a/src/main/java/org/xbill/DNS/config/SunJvmResolverConfigProvider.java b/src/main/java/org/xbill/DNS/config/SunJvmResolverConfigProvider.java
@@ -9,8 +9,13 @@
  * Resolver config provider that queries the traditional class {@code
  * sun.net.dns.ResolverConfiguration} via reflection.
  *
- * <p>As of Java 9, this generates an illegal reflective access exception and on Windows, this may
- * return invalid nameservers of disconnected NICs.
+ * <ul>
+ *   <li>As of Java 9, generates an illegal reflective access exception.
+ *   <li>As of Java 16, adding the JVM flag {@code --add-opens java.base/sun.net.dns=ALL-UNNAMED} is
+ *       required.
+ *   <li>On Windows, may return invalid nameservers of disconnected NICs before Java 15, <a
+ *       href="https://bugs.openjdk.java.net/browse/JDK-7006496">JDK-7006496</a>.
+ * </ul>
  */
 public class SunJvmResolverConfigProvider extends BaseResolverConfigProvider {
   public void initialize() throws InitializationException {
