[zookeeper] branch branch-3.6 updated: ZOOKEEPER-3785: Make sources buildable with JDK14

[eolivelli]

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

eolivelli pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.6 by this push:
     new 17374c0  ZOOKEEPER-3785: Make sources buildable with JDK14
17374c0 is described below

commit 17374c0d4e0af2b59d2b4a56d1bc2c4041e6315d
Author: Enrico Olivelli <eolive...@apache.org>
AuthorDate: Tue Apr 7 17:00:35 2020 +0200

    ZOOKEEPER-3785: Make sources buildable with JDK14
    
    Author: Enrico Olivelli <eolive...@apache.org>
    
    Reviewers: Mate Szalay-Beko <szalay.beko.m...@gmail.com>, TisunKun 
<wander4...@gmail.com>
    
    Closes #1308 from eolivelli/fix/jdk14
    
    (cherry picked from commit a8fb880218410ec3b31374d957e5a0bd6c8cdf28)
    Signed-off-by: Enrico Olivelli <eolive...@apache.org>
---
 zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java 
b/zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java
index f53399a..7c73ded 100644
--- a/zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java
+++ b/zookeeper-jute/src/main/java/org/apache/jute/compiler/JRecord.java
@@ -434,6 +434,7 @@ public class JRecord extends JCompType {
             jj.write("\n");
             jj.write("package " + getJavaPackage() + ";\n\n");
             jj.write("import org.apache.jute.*;\n");
+            jj.write("import org.apache.jute.Record; // JDK14 needs explicit 
import due to clash with java.lang.Record\n");
             jj.write("import org.apache.yetus.audience.InterfaceAudience;\n");
             jj.write("@InterfaceAudience.Public\n");
             jj.write("public class " + getName() + " implements Record {\n");