[accumulo] branch 1.9 updated: Fix build in latest Eclipse (for 1.9 branch)

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
     new b3ff32a  Fix build in latest Eclipse (for 1.9 branch)
b3ff32a is described below

commit b3ff32a8f4cacd6c13f3e11625c14ed2e0aade3f
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Feb 27 19:17:08 2019 -0500

    Fix build in latest Eclipse (for 1.9 branch)
    
    Apply workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=541772
    This ensures jetty-http is available on the compile time class path when
    building inside of an Eclipse m2e environment.
    
    Also fix trivial warnings, remove redundant type arguments.
---
 server/monitor/pom.xml                                   | 16 ++++++++++++++++
 .../apache/accumulo/tserver/log/SortedLogRecovery.java   |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 48ba792..f9d7a4a 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -235,5 +235,21 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <!-- workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=541772 -->
+      <id>m2e</id>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-http</artifactId>
+          <scope>compile</scope>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
index 211e0f2..08c664e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
@@ -158,7 +158,7 @@ public class SortedLogRecovery {
     }
 
     if (logsThatDefineTablet.isEmpty()) {
-      return new AbstractMap.SimpleEntry<Integer,List<Path>>(-1, Collections.<Path> emptyList());
+      return new AbstractMap.SimpleEntry<>(-1, Collections.<Path> emptyList());
     } else {
       return Collections.max(logsThatDefineTablet.entrySet(),
           new Comparator<Entry<Integer,List<Path>>>() {