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 dnsjava (2.1.8-1) unstable; urgency=medium
* Team upload. * Team upload.
......
...@@ -43,15 +43,6 @@ ...@@ -43,15 +43,6 @@
<build> <build>
<sourceDirectory>./</sourceDirectory> <sourceDirectory>./</sourceDirectory>
<testSourceDirectory>./tests</testSourceDirectory> <testSourceDirectory>./tests</testSourceDirectory>
<resources>
<resource>
<directory>org/xbill/DNS/spi/</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>services/</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
...@@ -72,7 +63,7 @@ ...@@ -72,7 +63,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version> <version>3.6.1</version>
<configuration> <configuration>
<source>${target.jdk}</source> <source>${target.jdk}</source>
<target>${target.jdk}</target> <target>${target.jdk}</target>
...@@ -82,10 +73,10 @@ ...@@ -82,10 +73,10 @@
<exclude>**/DNSSECWithLunaProviderTest.java</exclude> <exclude>**/DNSSECWithLunaProviderTest.java</exclude>
</testExcludes> </testExcludes>
<includes> <includes>
<include>*.java</include>
<include>org/**/*.java</include> <include>org/**/*.java</include>
</includes> </includes>
<excludes> <excludes>
<include>*.java</include>
<exclude>org/xbill/DNS/tests/**</exclude> <exclude>org/xbill/DNS/tests/**</exclude>
</excludes> </excludes>
</configuration> </configuration>
...@@ -114,6 +105,7 @@ ...@@ -114,6 +105,7 @@
</executions> </executions>
</plugin> </plugin>
<!--
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
...@@ -146,11 +138,12 @@ ...@@ -146,11 +138,12 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version> <version>2.10.4</version>
<configuration> <configuration>
<excludePackageNames>*.tests.*</excludePackageNames> <excludePackageNames>*.tests.*</excludePackageNames>
<sourcepath>./org</sourcepath> <sourcepath>./org</sourcepath>
...@@ -166,6 +159,14 @@ ...@@ -166,6 +159,14 @@
</goals> </goals>
</execution> </execution>
</executions> </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> </plugin>
</plugins> </plugins>
</build> </build>
...@@ -198,5 +199,58 @@ ...@@ -198,5 +199,58 @@
</plugins> </plugins>
</build> </build>
</profile> </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> </profiles>
</project> </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