From 907d247837d4542e85b239ea393f4950d8e6bdcb Mon Sep 17 00:00:00 2001
From: Marco Vogt <marco.vogt@unibas.ch>
Date: Mon, 30 Oct 2023 20:42:34 +0100
Subject: [PATCH] Bump some dependencies

---
 build.gradle                                  |  7 ++---
 .../client/PolyphenyControlConnector.java     |  2 +-
 gradle.properties                             | 30 +++++++++----------
 .../control/httpinterface/ClientRegistry.java |  4 +--
 .../control/httpinterface/Server.java         |  4 +--
 .../polypheny/control/main/TrayCommand.java   |  4 +--
 src/main/resources/static/index.html          | 18 +++++------
 7 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/build.gradle b/build.gradle
index 46a3fb7..b433c67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,11 +135,8 @@ licensee {
     allow('Apache-2.0')
     allow('MIT')
 
-    allowDependency('javax.servlet', 'javax.servlet-api', '3.1.0') {
-        because 'Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original source code for this can be found at http://www.eclipse.org/jetty/downloads.php'
-    }
-    allowDependency('org.java-websocket', 'Java-WebSocket', '1.5.3') { because 'MIT License' }
-    allowDependency('org.eclipse.jgit', 'org.eclipse.jgit', '6.4.0.202211300538-r') { because 'Eclipse Distribution License' }
+    allowDependency('org.java-websocket', 'Java-WebSocket', '1.5.4') { because 'MIT License' }
+    allowDependency('org.eclipse.jgit', 'org.eclipse.jgit', '6.7.0.202309050840-r') { because 'Eclipse Distribution License' }
 }
 
 
diff --git a/control-connector/src/main/java/org/polypheny/control/client/PolyphenyControlConnector.java b/control-connector/src/main/java/org/polypheny/control/client/PolyphenyControlConnector.java
index f56d28b..1f8b168 100644
--- a/control-connector/src/main/java/org/polypheny/control/client/PolyphenyControlConnector.java
+++ b/control-connector/src/main/java/org/polypheny/control/client/PolyphenyControlConnector.java
@@ -28,10 +28,10 @@
 import kong.unirest.HttpResponse;
 import kong.unirest.Unirest;
 import kong.unirest.UnirestException;
+import kong.unirest.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
-import org.json.simple.JSONObject;
 
 
 @Slf4j
diff --git a/gradle.properties b/gradle.properties
index 863090a..6dd747c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,24 +3,24 @@ versionMinor = 3
 versionPatch = 1
 isSnapshot = true
 
-slf4j_version = 1.7.36
-log4j_version = 2.19.0
-typesafe_config_version = 1.4.2
-commons_lang_version = 3.12.0
-commons_io_version = 2.11.0
-guava_version = 31.1-jre
+slf4j_version = 2.0.9
+log4j_version = 2.21.1
+typesafe_config_version = 1.4.3
+commons_lang_version = 3.13.0
+commons_io_version = 2.15.0
+guava_version = 32.1.3-jre
 airline_version = 2.9.0
-javalin_version = 3.13.13
-unirest_version = 3.13.10
-java_websocket_version = 1.5.3
-gson_version = 2.10
-json_simple_version = 2.3.1
+javalin_version = 5.6.3
+unirest_version = 3.14.5
+java_websocket_version = 1.5.4
+gson_version = 2.10.1
+json_simple_version = 4.0.1
 winp_version = 1.28
-jgit_version = 6.4.0.202211300538-r
+jgit_version = 6.7.0.202309050840-r
 gradle_tooling_api_version = 7.4.2
-font_awesome_version = 5.15.4
-jquery_version = 3.6.2
+font_awesome_version = 6.4.2
+jquery_version = 3.7.1
 serializejson_version = 2.9.0
 ansi_up_version = 2.0.2
 tooltipster_version = 4.2.8
-jupiter_version = 5.8.2
\ No newline at end of file
+jupiter_version = 5.10.0
diff --git a/src/main/java/org/polypheny/control/httpinterface/ClientRegistry.java b/src/main/java/org/polypheny/control/httpinterface/ClientRegistry.java
index f25a4fb..fb61d53 100644
--- a/src/main/java/org/polypheny/control/httpinterface/ClientRegistry.java
+++ b/src/main/java/org/polypheny/control/httpinterface/ClientRegistry.java
@@ -96,7 +96,7 @@ static synchronized void addClient( WsConnectContext ctx ) {
         clientMap.put( ctx.session, client );
         reverseClientMap.put( cid, client );
         sendMessage( cid, "clientId", "" + cid );
-        log.info( "Registered client {} from IP {}", cid, ctx.session.getRemoteAddress().getAddress().getHostAddress() );
+        log.info( "Registered client {} from IP {}", cid, ctx.session.getRemoteAddress() );
         sendMessage( cid, "status", "" + ServiceManager.getStatus() );
         sendMessage( cid, "benchmarkerConnected", "" + ClientRegistry.getBenchmarkerConnected() );
         sendMessage( cid, "version", ServiceManager.getVersion() );
@@ -106,7 +106,7 @@ static synchronized void addClient( WsConnectContext ctx ) {
     static void removeClient( WsCloseContext closeContext ) {
         Client client = clientMap.remove( closeContext.session );
         reverseClientMap.remove( client.clientId );
-        log.info( "Removed client {} from IP {}", client.clientId, closeContext.session.getRemoteAddress().getAddress().getHostAddress() );
+        log.info( "Removed client {} from IP {}", client.clientId, closeContext.session.getRemoteAddress() );
     }
 
 
diff --git a/src/main/java/org/polypheny/control/httpinterface/Server.java b/src/main/java/org/polypheny/control/httpinterface/Server.java
index 01eda17..2f6db03 100644
--- a/src/main/java/org/polypheny/control/httpinterface/Server.java
+++ b/src/main/java/org/polypheny/control/httpinterface/Server.java
@@ -30,11 +30,11 @@
 @Slf4j
 public class Server {
 
-    private static final Gson gson = new Gson();
+    private static final Gson GSON = new Gson();
 
 
     public Server( Control control, int port ) {
-        Javalin javalin = Javalin.create( config -> config.addStaticFiles( "/static" ) ).start( port );
+        Javalin javalin = Javalin.create( config -> config.staticFiles.add( "/static" ) ).start( port );
 
         javalin.ws( "/socket/", ws -> {
             ws.onConnect( ClientRegistry::addClient );
diff --git a/src/main/java/org/polypheny/control/main/TrayCommand.java b/src/main/java/org/polypheny/control/main/TrayCommand.java
index ea63834..a4c1b2f 100644
--- a/src/main/java/org/polypheny/control/main/TrayCommand.java
+++ b/src/main/java/org/polypheny/control/main/TrayCommand.java
@@ -105,13 +105,13 @@ public void actionPerformed( ActionEvent e ) {
         // Add separator
         trayPopupMenu.addSeparator();
 
-        // Open Polypheny-Control UI in the browser
+        // Open Polypheny-UI in the browser
         MenuItem puiItem = new MenuItem( "Polypheny-UI" );
         puiItem.addActionListener( new ActionListener() {
             @SneakyThrows
             @Override
             public void actionPerformed( ActionEvent e ) {
-                Desktop.getDesktop().browse( new URI( "http://localhost:8080" ) );
+                Desktop.getDesktop().browse( new URI( "http://localhost:7659" ) );
             }
         } );
         trayPopupMenu.add( puiItem );
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index e4a38c7..21d160f 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -20,18 +20,12 @@
     <title>Polypheny Control</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-    <link rel="stylesheet" href="/font-awesome/5.15.4/css/all.css">
+    <link rel="stylesheet" href="/font-awesome/6.4.2/css/all.css">
     <link rel="stylesheet" href="/tooltipster/4.2.8/dist/css/tooltipster.bundle.min.css">
     <link rel="stylesheet" href="/style.css">
-    <script>
-        function setHref() {
-            document.getElementById( 'webui-link' ).href = window.location.protocol + "//" + window.location.hostname + ":8080/";
-        }
-
-    </script>
 </head>
 
-<body onload="setHref()">
+<body>
 <div class="root">
     <div class="main">
         <h1 class="heading">Polypheny Control</h1>
@@ -216,11 +210,17 @@ <h1>Loading...</h1>
     </table>
 </footer>
 
-<script src="/jquery/3.6.2/jquery.js"></script>
+<script src="/jquery/3.7.1/jquery.js"></script>
 <script src="/jquery-serializejson/2.9.0/jquery.serializejson.min.js"></script>
 <script src="/ansi_up/2.0.2/ansi_up.js"></script>
 <script src="/tooltipster/4.2.8/dist/js/tooltipster.bundle.min.js"></script>
 <script src="/script.js"></script>
+<script>
+    function setHref() {
+        document.getElementById( 'webui-link' ).href = window.location.protocol + "//" + window.location.hostname + ":7659/";
+    }
+    setHref();
+</script>
 </body>
 
 </html>