commit 5a6481f7c15253bfc19a0ded5a96cb02ce9edb7e
author Christopher Tubbs <ctubbsii@apache.org> Mon Jul 29 15:08:16 2019 -0400
committer Christopher Tubbs <ctubbsii@apache.org> Mon Jul 29 15:08:16 2019 -0400
tree ac46c143f33e9f8e102460558e894c9eb79969a5
parent 0bb3f896a28ec315976fb4570ced8e3913a75587
parent fd4d4788dfc8726f27e235249479677318384c09

Merge branch '1.9' into 2.0

pom.xml

diff --git a/pom.xml b/pom.xml
index c08d56c..bc9d69b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1353,6 +1353,10 @@
           <name>m2e.version</name>
         </property>
       </activation>
+      <properties>
+        <!-- enforces Java 8 compiler compliance, even when Eclipse uses JDK 9 or later -->
+        <maven.compiler.release>8</maven.compiler.release>
+      </properties>
       <build>
         <pluginManagement>
           <plugins>

test/src/main/java/org/apache/accumulo/test/ShellServerIT.java

diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index bbaaba6..adae888 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -835,7 +835,7 @@
   public void classpath() throws Exception {
     // classpath
     ts.exec("classpath", true,
-        "Level 2: Java Classloader (loads everything" + " defined by java classpath)", true);
+        "Level 2: Java Classloader (loads everything defined by java classpath)", true);
   }
 
   @Test