From 864049b9b0f705aba663d20eecc2ca23e9b495a1 Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Fri, 13 Jul 2018 10:52:32 -0400
Subject: [PATCH] Updates for Java 10

---
 .gitignore  |  1 +
 .travis.yml |  3 ---
 mvnw        |  0
 pom.xml     | 51 +++++++++++++++++++++++++++++++++++++++------------
 4 files changed, 40 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 mvnw

diff --git a/.gitignore b/.gitignore
index a570aa57f..f739f3154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ buildNumber.properties
 /.vscode/
 /bin/
 .mvn/wrapper/maven-wrapper.jar
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
index 5ea776188..69c990858 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 language: java
 sudo: false
 
-before_install:
-  - chmod +x mvnw
-
 jdk:
   - oraclejdk9
   - oraclejdk8
diff --git a/mvnw b/mvnw
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
index 01e0309d0..c72ef8363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.1</version>
         <reportSets>
           <reportSet>
             <reports>
@@ -56,6 +57,11 @@
           </reportSet>
         </reportSets>
       </plugin>
+      <plugin> <!-- JDK 10 -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.0.1</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -63,10 +69,42 @@
           <configLocation>checkstyle-override.xml</configLocation>
         </configuration>
       </plugin>
+      <!-- Added for JDK 10 -->
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>3.1.5</version>
+      </plugin>
     </plugins>
   </reporting>
   
   <build>
+    <pluginManagement>
+      <!-- Added for JDK 10 -->
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.8.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -88,17 +126,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>${junit.platform.version}</version>            
-          </dependency>
-        </dependencies>
-      </plugin>
     </plugins>
   </build>
   
@@ -143,7 +170,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>5.0.6.RELEASE</version>
+      <version>5.0.7.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>