From 5b662d93dfff248a84c6304cd0fc807420061f32 Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <stephen@opengamma.com>
Date: Tue, 10 Oct 2017 17:56:41 +0100
Subject: [PATCH 1/4] Add module-info for Java 9

Add the module-info.java file
Make the appropriate changes to pom.xml
---
 pom.xml                        | 61 ++++++++++++++++++++++++++++------
 src/main/java/module-info.java | 41 +++++++++++++++++++++++
 2 files changed, 92 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/module-info.java

diff --git a/pom.xml b/pom.xml
index 6db828ae5bc..d6b28f15a70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,6 @@
     <developer>
       <name>Stephen Colebourne</name>
       <id>scolebourne</id>
-      <email>scolebourne@joda.org</email>
-      <organization>SITA ATS Ltd</organization>
       <timezone>0</timezone>
       <roles>
         <role>Java Developer</role>
@@ -593,6 +591,11 @@
     <!-- JMH Benchmark related properties, version, target compiler and name of the benchmarking uber jar. -->
     <jmh.version>1.17.4</jmh.version>
     <uberjar.name>benchmarks</uberjar.name>
+
+    <!-- Override versions for Java 9 -->
+    <commons.felix.version>3.3.0</commons.felix.version>
+    <!-- Skip animal sniffer, as it doesn't work on Java 9 and the release flag does the same job -->
+    <animal.sniffer.skip>true</animal.sniffer.skip>
   </properties>
 
 
@@ -616,6 +619,40 @@
       </plugins>
     </pluginManagement>
     <plugins>
+      <!-- Compile twice, once with Java 9 and once without -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <configuration>
+              <jdkToolchain>
+                <version>9</version>
+              </jdkToolchain>
+              <release>9</release>
+            </configuration>
+          </execution>
+          <execution>
+            <id>base-compile</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <excludes>
+                <exclude>module-info.java</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+        </executions>
+        <!-- setup defaults for compile and testCompile -->
+        <configuration>
+          <jdkToolchain>
+            <version>9</version>
+          </jdkToolchain>
+          <release>7</release>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -654,14 +691,18 @@
             </goals>
           </execution>
         </executions>
-        <!-- Temporary fix for LANG-1338, remove this after this has implemented in parent pom -->
-        <configuration>
-          <archive combine.children="append">
-            <manifestEntries>
-              <Automatic-Module-Name>org.apache.commons.lang3</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
+      </plugin>
+      <!-- https://issues.apache.org/jira/browse/FELIX-5698 -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>biz.aQute.bndlib</artifactId>
+            <version>3.5.0</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 00000000000..4f25555aa35
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Apache Commons Lang provides utility classes for the core of Java.
+ */
+module org.apache.commons.lang3 {
+
+    // see AbstractCircuitBreaker
+    requires static java.desktop;
+
+    // all packages are exported
+    exports org.apache.commons.lang3;
+    exports org.apache.commons.lang3.arch;
+    exports org.apache.commons.lang3.builder;
+    exports org.apache.commons.lang3.concurrent;
+    exports org.apache.commons.lang3.event;
+    exports org.apache.commons.lang3.exception;
+    exports org.apache.commons.lang3.math;
+    exports org.apache.commons.lang3.mutable;
+    exports org.apache.commons.lang3.reflect;
+    exports org.apache.commons.lang3.text;
+    exports org.apache.commons.lang3.text.translate;
+    exports org.apache.commons.lang3.time;
+    exports org.apache.commons.lang3.tuple;
+
+}

From d502bad924ec109d971c15b6a7a432b14f3562f1 Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <stephen@opengamma.com>
Date: Tue, 10 Oct 2017 18:19:08 +0100
Subject: [PATCH 2/4] Fix Travis build

---
 .travis.yml | 4 +---
 pom.xml     | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 49775378969..b594f172dfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,10 @@ language: java
 sudo: false
 
 jdk:
-  - openjdk7
-  - oraclejdk8
   - oraclejdk9
 
 script:
   - mvn
 
 after_success:
-  - mvn clean cobertura:cobertura coveralls:report -Ptravis-cobertura
+  - mvn clean cobertura:cobertura -Ptravis-cobertura
diff --git a/pom.xml b/pom.xml
index d6b28f15a70..c80ac2d6392 100644
--- a/pom.xml
+++ b/pom.xml
@@ -593,6 +593,7 @@
     <uberjar.name>benchmarks</uberjar.name>
 
     <!-- Override versions for Java 9 -->
+    <commons.compiler.version>3.7.0</commons.compiler.version>
     <commons.felix.version>3.3.0</commons.felix.version>
     <!-- Skip animal sniffer, as it doesn't work on Java 9 and the release flag does the same job -->
     <animal.sniffer.skip>true</animal.sniffer.skip>

From cb5a17949bf941118a80ef05ccd5a77717779792 Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <scolebourne@joda.org>
Date: Tue, 17 Oct 2017 18:47:09 +0100
Subject: [PATCH 3/4] Reinstate compilation on Java 7 and 8

Enhance Travis build
---
 .travis.yml | 17 +++++++--
 pom.xml     | 99 ++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 78 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b594f172dfb..f32f7aab850 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,23 @@ language: java
 sudo: false
 
 jdk:
+  - openjdk7
+  - oraclejdk8
   - oraclejdk9
 
+cache:
+  directories:
+    - "$HOME/.m2/repository"
+
+before_cache:
+  - rm -rf $HOME/.m2/repository/org/apache/commons/commons-lang3
+
+install:
+  - mvn --version
+
 script:
-  - mvn
+  - mvn clean install -e -B
 
 after_success:
-  - mvn clean cobertura:cobertura -Ptravis-cobertura
+  - if [ $TRAVIS_JDK_VERSION == "openjdk7" ] || [ $TRAVIS_JDK_VERSION == "oraclejdk8" ]; then mvn -e -B clean cobertura:cobertura coveralls:report -Ptravis-cobertura; fi
+  - if [ $TRAVIS_JDK_VERSION == "oraclejdk9" ]; then mvn -e -B clean cobertura:cobertura -Ptravis-cobertura; fi
diff --git a/pom.xml b/pom.xml
index c80ac2d6392..8c30e281cdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -595,8 +595,6 @@
     <!-- Override versions for Java 9 -->
     <commons.compiler.version>3.7.0</commons.compiler.version>
     <commons.felix.version>3.3.0</commons.felix.version>
-    <!-- Skip animal sniffer, as it doesn't work on Java 9 and the release flag does the same job -->
-    <animal.sniffer.skip>true</animal.sniffer.skip>
   </properties>
 
 
@@ -620,40 +618,6 @@
       </plugins>
     </pluginManagement>
     <plugins>
-      <!-- Compile twice, once with Java 9 and once without -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-compile</id>
-            <configuration>
-              <jdkToolchain>
-                <version>9</version>
-              </jdkToolchain>
-              <release>9</release>
-            </configuration>
-          </execution>
-          <execution>
-            <id>base-compile</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <excludes>
-                <exclude>module-info.java</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-        <!-- setup defaults for compile and testCompile -->
-        <configuration>
-          <jdkToolchain>
-            <version>9</version>
-          </jdkToolchain>
-          <release>7</release>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -869,6 +833,31 @@
       </build>
     </profile>
 
+    <profile>
+      <id>java7and8</id>
+      <activation>
+        <jdk>[1.7,9)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <!-- Don't compile module-info.java, see java 9 profile -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-compile</id>
+                <configuration>
+                  <excludes>
+                    <exclude>module-info.java</exclude>
+                  </excludes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>java9</id>
       <activation>
@@ -881,7 +870,45 @@
         <commons.javadoc.version>3.0.0-M1</commons.javadoc.version>
         <!-- coverall version 4.3.0 does not work with java 9, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
         <coveralls.skip>true</coveralls.skip>
+        <!-- Skip animal sniffer, as it doesn't work on Java 9 and the release flag does the same job -->
+        <animal.sniffer.skip>true</animal.sniffer.skip>
       </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <!--  compile first with module-info for Java 9 -->
+              <execution>
+                <id>default-compile</id>
+                <configuration>
+                  <release>9</release>
+                </configuration>
+              </execution>
+              <!--  then compile without module-info for Java 7 -->
+              <execution>
+                <id>base-compile</id>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <configuration>
+                  <excludes>
+                    <exclude>module-info.java</exclude>
+                  </excludes>
+                </configuration>
+              </execution>
+            </executions>
+            <!-- setup defaults for compile and testCompile -->
+            <configuration>
+              <jdkToolchain>
+                <version>9</version>
+              </jdkToolchain>
+              <release>7</release>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
     <profile>

From 886b26aa09efc1a4bfca3470e33b952399f18f6d Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <stephen@opengamma.com>
Date: Wed, 18 Oct 2017 11:07:06 +0100
Subject: [PATCH 4/4] Reinstate the default build

Fix Javadoc and Checkstyle
---
 .travis.yml |  2 +-
 pom.xml     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f32f7aab850..2a209d2a653 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ install:
   - mvn --version
 
 script:
-  - mvn clean install -e -B
+  - mvn -e -B
 
 after_success:
   - if [ $TRAVIS_JDK_VERSION == "openjdk7" ] || [ $TRAVIS_JDK_VERSION == "oraclejdk8" ]; then mvn -e -B clean cobertura:cobertura coveralls:report -Ptravis-cobertura; fi
diff --git a/pom.xml b/pom.xml
index 8c30e281cdc..b0f23b5724c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -595,6 +595,7 @@
     <!-- Override versions for Java 9 -->
     <commons.compiler.version>3.7.0</commons.compiler.version>
     <commons.felix.version>3.3.0</commons.felix.version>
+    <commons.javadoc.version>3.0.0-M1</commons.javadoc.version>
   </properties>
 
 
@@ -685,6 +686,7 @@
           <configLocation>${basedir}/checkstyle.xml</configLocation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <enableRulesSummary>false</enableRulesSummary>
+          <excludes>module-info.java</excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -855,6 +857,16 @@
               </execution>
             </executions>
           </plugin>
+          <!-- Avoid errors from module-info -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <sourceFileExcludes>
+                <sourceFileExclude>module-info.java</sourceFileExclude>
+              </sourceFileExcludes>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -872,6 +884,8 @@
         <coveralls.skip>true</coveralls.skip>
         <!-- Skip animal sniffer, as it doesn't work on Java 9 and the release flag does the same job -->
         <animal.sniffer.skip>true</animal.sniffer.skip>
+        <!-- Skip clirr, as it doesn't work on Java 9 -->
+        <clirr.skip>true</clirr.skip>
       </properties>
       <build>
         <plugins>