[dnsjava] 01/05: Fixed the build failure with Java 9 (Closes: #875357)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository dnsjava.

commit 21f2f34221e910976c485af5de735a098f3bb90d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 12 15:25:49 2018 +0100

    Fixed the build failure with Java 9 (Closes: #875357)
---
 debian/changelog |  7 +++++
 debian/pom.xml   | 78 +++++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4cd22b6..e6c8c78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dnsjava (2.1.8-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #875357)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 12 Mar 2018 15:25:15 +0100
+
 dnsjava (2.1.8-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/pom.xml b/debian/pom.xml
index 94ee309..bd7b186 100644
--- a/debian/pom.xml
+++ b/debian/pom.xml
@@ -43,15 +43,6 @@
     <build>
         <sourceDirectory>./</sourceDirectory>
         <testSourceDirectory>./tests</testSourceDirectory>
-        <resources>
-            <resource>
-                <directory>org/xbill/DNS/spi/</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>services/</include>
-                </includes>
-            </resource>
-        </resources>
 
         <plugins>
         
@@ -72,7 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.6.1</version>
                 <configuration>
                     <source>${target.jdk}</source>
                     <target>${target.jdk}</target>
@@ -82,10 +73,10 @@
                         <exclude>**/DNSSECWithLunaProviderTest.java</exclude>
                     </testExcludes>
                     <includes>
+                        <include>*.java</include>
                         <include>org/**/*.java</include>
                     </includes>
                     <excludes>
-                        <include>*.java</include>
                         <exclude>org/xbill/DNS/tests/**</exclude>
                     </excludes>
                 </configuration>
@@ -114,6 +105,7 @@
                 </executions>
             </plugin>
 
+<!--
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.4</version>
@@ -146,11 +138,12 @@
                     </execution>
                 </executions>
             </plugin>
+-->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.7</version>
+                <version>2.10.4</version>
                 <configuration>
                     <excludePackageNames>*.tests.*</excludePackageNames>
                     <sourcepath>./org</sourcepath>
@@ -166,6 +159,14 @@
                         </goals>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <!-- Workaround to be able to use JDK 9 >= b175 -->
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
+                        <version>2.6</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
@@ -198,5 +199,58 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>spi-up-to-java8</id>
+            <activation>
+                <jdk>(,1.8]</jdk>
+            </activation>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>org/xbill/DNS/spi/</directory>
+                        <targetPath>META-INF</targetPath>
+                        <includes>
+                            <include>services/</include>
+                        </includes>
+                    </resource>
+                </resources>
+            </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>
+            </activation>
+
+            <properties>
+                <target.jdk>9</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>
+                            <excludes>
+                                <exclude>org/xbill/DNS/tests/**</exclude>
+                                <exclude>org/xbill/DNS/spi/**</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <excludePackageNames>*.tests.*:*.spi.*</excludePackageNames>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dnsjava.git