Skip to content
Snippets Groups Projects
Commit 21f2f342 authored by Emmanuel Bourg's avatar Emmanuel Bourg
Browse files

Fixed the build failure with Java 9 (Closes: #875357)

parent e6408cd7
No related branches found
No related tags found
No related merge requests found
dnsjava (2.1.8-2) UNRELEASED; urgency=medium
* Team upload.
* Fixed the build failure with Java 9 (Closes: #875357)
-- Emmanuel Bourg <ebourg@apache.org> Mon, 12 Mar 2018 15:25:15 +0100
dnsjava (2.1.8-1) unstable; urgency=medium
* Team upload.
......
......@@ -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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment