From 5902ba3ae7e3064f08c75bddd3b7b205aa0514be Mon Sep 17 00:00:00 2001
From: Prem Prakash <prem_im@yahoo.com>
Date: Mon, 17 Feb 2020 19:22:29 -0800
Subject: [PATCH] upgrade pom dependencies and Java 11 support

---
 .gitignore |  3 +++
 pom.xml    | 15 ++++++++-------
 zkui.sh    |  7 ++++---
 3 files changed, 15 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 zkui.sh

diff --git a/.gitignore b/.gitignore
index a0d350f..ceeb767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 .idea/
 zkui.iml
 /target/
+*.out
+*.h2.db
+*.log
diff --git a/pom.xml b/pom.xml
index 92c0fba..abe928f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jetty.version>9.4.26.v20200117</jetty.version>
     </properties>
     
     <dependencies>
@@ -24,17 +25,17 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
-            <version>9.1.0.M0</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-annotations</artifactId>
-            <version>9.1.0.M0</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.1.0.M0</version>
+            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -59,7 +60,7 @@
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-            <version>3.4.5</version>
+            <version>3.5.7</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun.jmx</groupId>
@@ -74,7 +75,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.3</version>
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.flyway</groupId>
@@ -105,8 +106,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/zkui.sh b/zkui.sh
old mode 100644
new mode 100755
index 9f4dde5..0008f03
--- a/zkui.sh
+++ b/zkui.sh
@@ -1,18 +1,19 @@
 #!/usr/bin/env bash
 
-PIDFILE=/var/run/zkui.pid
+PIDFILE=~/zkui.pid
 ZKUIBINDIR=$(cd `dirname $0`; pwd)
-ZKUICLASSNAME="zkui-2.0-SNAPSHOT-jar-with-dependencies.jar"
+ZKUICLASSNAME="target/zkui-2.0-SNAPSHOT-jar-with-dependencies.jar"
 ZKUI_DAEMON_OUT=$ZKUIBINDIR/zkui.out
 
 start(){
-    echo  -n "Starting zkui ... "
+    echo  "Starting zkui ... $ZKUIBINDIR"
     if [ -f "$PIDFILE" ]; then
         if kill -0 `cat "$PIDFILE"` > /dev/null 2>&1; then
             echo zkui already running as process `cat "$PIDFILE"`. 
             exit 0
         fi
     fi
+    cp config.cfg target
     nohup java -jar "$ZKUIBINDIR/$ZKUICLASSNAME" > "$ZKUI_DAEMON_OUT" 2>&1 < /dev/null &
     if [ $? -eq 0 ];
     then