From bbcab32874711f856040a47ee8e45cfbf4b29846 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Tue, 15 Aug 2017 12:19:10 +0200
Subject: [PATCH] Ensure netty builds with java9 (build 9+181)

Motivation:

To be able to build with latest java9 release we need to adjust commons-lang version and maven-enforcer-plugin.

Modifications:

- Use commons-lang 2.6.0
- Use maven-enforcer-plugin 3.0.0.M1 when building with java9

Result:

Netty builds again with latest java9 release
---
 pom.xml              |  4 ++++
 resolver-dns/pom.xml | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/pom.xml b/pom.xml
index 94f709af05..c70b57720a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,8 @@
         <!-- Skip as maven plugin not works with Java9 yet --> 
         <skipOsgiTestsuite>true</skipOsgiTestsuite>
         <forbiddenapis.skip>true</forbiddenapis.skip>
+        <!-- Needed because of https://issues.apache.org/jira/browse/MENFORCER-275 -->
+        <enforcer.plugin.version>3.0.0-M1</enforcer.plugin.version>
       </properties>
       <activation>
         <jdk>9</jdk>
@@ -199,6 +201,7 @@
     <logging.logLevel>debug</logging.logLevel>
     <log4j2.version>2.6.2</log4j2.version>
     <asm.version>5.1</asm.version>
+    <enforcer.plugin.version>1.4.1</enforcer.plugin.version>
     <testJavaHome>${env.JAVA_HOME}</testJavaHome>
     <skipOsgiTestsuite>false</skipOsgiTestsuite>
     <skipAutobahnTestsuite>false</skipAutobahnTestsuite>
@@ -576,6 +579,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
+        <version>${enforcer.plugin.version}</version>
         <executions>
           <execution>
             <id>enforce-tools</id>
diff --git a/resolver-dns/pom.xml b/resolver-dns/pom.xml
index c2e3b8f79d..b1978628cb 100644
--- a/resolver-dns/pom.xml
+++ b/resolver-dns/pom.xml
@@ -48,6 +48,22 @@
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-dns</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <!--
+          We need to use commons-lang 2.6 to be able to run the tests with java9
+          See https://github.com/apache/bookkeeper/issues/385
+        -->
+        <exclusion>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.6</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>