From 241fbb723b4dd8b5cdf01aa923e4f5fbb1dc9590 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Fri, 8 Feb 2019 10:39:48 -0800
Subject: [PATCH] Add a module config, twiddle build to support it.

We now have to build with JDK9 or above, but I believe that the built jar files
continue to be compatible with JDK 1.7 or above. If this turns out not to be
the case, please let me know.
---
 .travis.yml                    |  2 +-
 pom.xml                        | 29 ++++++++++++++++++++++++++---
 src/main/java/module-info.java |  5 +++++
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/module-info.java

diff --git a/.travis.yml b/.travis.yml
index caf4b60..db11f5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 language: java
 
 jdk:
-  - oraclejdk8
+  - oraclejdk9
 
 cache:
   directories:
diff --git a/pom.xml b/pom.xml
index 35a0ea8..ea12f70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,11 +40,11 @@
     <developerConnection>scm:git:git@github.com:samskivert/jmustache.git</developerConnection>
     <url>http://github.com/samskivert/jmustache</url>
   </scm>
-
+<!-- 
   <prerequisites>
     <maven>3.3.0</maven>
   </prerequisites>
-
+ -->
   <properties>
     <source.level>1.7</source.level>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -98,7 +98,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
+        <version>3.7.0</version>
         <configuration>
           <source>${source.level}</source>
           <target>${source.level}</target>
@@ -116,6 +116,28 @@
             <exclude>**/super/**</exclude>
           </excludes>
         </configuration>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <configuration>
+              <includes>
+                <include>module-info.java</include>
+              </includes>
+              <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>
       </plugin>
 
       <plugin>
@@ -181,6 +203,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>3.1.1</version>
         <configuration>
           <archive>
             <manifestEntries>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..a6dec0a
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module com.samskivert.mustache {
+    requires java.base;
+
+    exports com.samskivert.mustache;
+}